Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.out @ 675:49de76abc4da
hg clone stored path fix
# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Node ID a08808d8ffd811c1174216c598da5c27d20bc2c9
# Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d
hg clone stored path fix
The abspath() has been lost in changeset 634 (da5378d39269).
| author | Mikael Berthe <mikael@lilotux.net> |
|---|---|
| date | Sun, 10 Jul 2005 16:15:20 -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