Mercurial > hg > gitweb

view tests/test-merge1.out @ 800:ec85f9e6f3b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Jul 2005 15:19:43 +0100
parents 7e4843b7efd2
children 1f9ec150a476 8f5637f0a0c0 0902ffece4b4
line wrap: on
line source

+ cat
+ chmod +x merge
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ hg update 0
+ echo This is file c1
+ hg add c
+ hg commit -m 'commit #2' -d '0 0'
+ echo This is file b1
+ env HGMERGE=../merge hg update -m 1
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ hg update 0
+ echo This is file c1
+ hg add c
+ hg commit -m 'commit #2' -d '0 0'
+ echo This is file b2
+ env HGMERGE=../merge hg update -m 1
merging for b
merging b
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ echo This is file b22
+ hg commit -m 'commit #2' -d '0 0'
+ hg update 1
+ echo This is file c1
+ hg add c
+ hg commit -m 'commit #3' -d '0 0'
+ cat b
This is file b1
+ echo This is file b22
+ env HGMERGE=../merge hg update -m 2
merging for b
merging b
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ echo This is file b22
+ hg commit -m 'commit #2' -d '0 0'
+ hg update 1
+ echo This is file c1
+ hg add c
+ hg commit -m 'commit #3' -d '0 0'
+ echo This is file b33
+ env HGMERGE=../merge hg update -m 2
merging for b
merging b
+ cd ..
+ /bin/rm -rf t