← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mercurial/lucid

« back to all changes in this revision

Viewing changes to tests/test-convert-hg-source.out

  • Committer: Bazaar Package Importer
  • Author(s): Vernon Tang
  • Date: 2009-01-18 10:39:58 UTC
  • mfrom: (8.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090118103958-4ep2fqb5nl2pyc7y
Tags: 1.1.2-2
http://bugs.debian.org/512155
* debian/mercurial.postinst: symlink /usr/share/doc/mercurial if dpkg didn't
  do it when upgrading (closes: #512155)
* debian/control: mercurial-common replaces all earlier versions of
  mercurial

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-convert-hg-source.out
1
1
created new head
2
 
merging baz and foo
 
2
merging baz and foo to baz
3
3
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
4
4
(branch merge, don't forget to commit)
5
5
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
6
 
merging foo and baz
 
6
merging foo and baz to baz
7
7
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
8
8
(branch merge, don't forget to commit)
9
9
created new head
20
20
comparing with ../orig
21
21
searching for changes
22
22
no changes found
 
23
% init broken repository
 
24
created new head
 
25
% break it
 
26
initializing destination fixed repository
 
27
scanning source...
 
28
sorting...
 
29
converting...
 
30
4 init
 
31
ignoring: data/b.i@1e88685f5dde: no match found
 
32
3 changebagain
 
33
2 changeall
 
34
1 merge
 
35
0 moveb
 
36
checking changesets
 
37
checking manifests
 
38
crosschecking files in changesets and manifests
 
39
checking files
 
40
3 files, 5 changesets, 5 total revisions
 
41
% manifest -r 0
 
42
a
 
43
% manifest -r tip
 
44
a
 
45
c
 
46
d