Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.out @ 610:4c02464cb9f0
check export options for changeset before running
# HG changeset patch
# User shaleh@speakeasy.net
# Node ID 0cc64f4312540b2081c76dc589cc825d734676d8
# Parent f7bfe827ea381afc89f486b2d93d7f4fe86de04d
check export options for changeset before running
diff -r f7bfe827ea38 -r 0cc64f431254 mercurial/commands.py
author | shaleh@speakeasy.net |
---|---|
date | Mon, 04 Jul 2005 11:06:01 -0800 |
parents | 5b22029b5aa2 |
children | 7e4843b7efd2 |
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 -t 'commit #0' -d '0 0' -u user + echo This is file b1 + hg add b + hg commit -t 'commit #1' -d '0 0' -u user + hg update 0 + echo This is file c1 + hg add c + hg commit -t 'commit #2' -d '0 0' -u user + 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 -t 'commit #0' -d '0 0' -u user + echo This is file b1 + hg add b + hg commit -t 'commit #1' -d '0 0' -u user + hg update 0 + echo This is file c1 + hg add c + hg commit -t 'commit #2' -d '0 0' -u user + 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 -t 'commit #0' -d '0 0' -u user + echo This is file b1 + hg add b + hg commit -t 'commit #1' -d '0 0' -u user + echo This is file b22 + hg commit -t 'commit #2' -d '0 0' -u user + hg update 1 + echo This is file c1 + hg add c + hg commit -t 'commit #3' -d '0 0' -u user + 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 -t 'commit #0' -d '0 0' -u user + echo This is file b1 + hg add b + hg commit -t 'commit #1' -d '0 0' -u user + echo This is file b22 + hg commit -t 'commit #2' -d '0 0' -u user + hg update 1 + echo This is file c1 + hg add c + hg commit -t 'commit #3' -d '0 0' -u user + echo This is file b33 + env HGMERGE=../merge hg update -m 2 merging for b merging b + cd .. + /bin/rm -rf t