##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

updated help text and added manpage section for hg paths...
updated help text and added manpage section for hg paths Index: hg/doc/hg.1.txt ===================================================================
mpm@selenic.com - - Load All Authors

File last commit:

r814:0902ffec merge default
r924:ab681ea2 default
Show More
test-merge6.out
35 lines | 868 B | text/plain | TextLexer
/ tests / test-merge6.out
History | Annotation | Raw |Copy content |Copy permalink
+ hg init
+ hg add foo bar
+ hg commit -m commit text -d 0 0
+ hg clone A1 B1
+ hg remove bar
+ hg commit -m commit test -d 0 0
+ hg commit -m commit test -d 0 0
+ hg clone A1 A2
+ hg clone B1 B2
+ hg pull ../B1
pulling from ../B1
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
+ hg update -m
+ hg commit -m commit test -d 0 0
bar should remain deleted.
+ hg manifest
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
+ hg pull ../A2
pulling from ../A2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files
(run 'hg update' to get a working copy)
+ hg update -m
+ hg commit -m commit test -d 0 0
bar should remain deleted.
+ hg manifest
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo