← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/test-merge-remove.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-merge-remove.out
1
1
created new head
2
 
merging foo1 and foo
 
2
merging foo1 and foo to foo1
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
n   0         -2 bar
13
13
copy: foo -> foo1
14
14
R bar
15
15
R foo1
16
 
  foo
17
16
% readding foo1 and bar
18
17
adding bar
19
18
adding foo1
24
23
M foo1
25
24
  foo
26
25
% reverting foo1 and bar
27
 
warning: working directory has two parents, tag '.' uses the first
28
26
saving current version of bar as bar.orig
29
27
reverting bar
30
28
saving current version of foo1 as foo1.orig