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

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

fetch: switch the default parent used for a merge...
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.
Dustin Sallings - - Load All Authors

File last commit:

r6067:57c1a705 default
r6206:0b6f1249 default
Show More
test-branches.out
40 lines | 1.2 KiB | text/plain | TextLexer
/ tests / test-branches.out
History | Annotation | Raw |Copy content |Copy permalink
marked working directory as branch a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch c
c 5:5ca481e59b8c
a 1:dd6b440dd85a
b 4:22df7444f7c1 (inactive)
default 0:19709c5a4e75 (inactive)
-------
c 5:5ca481e59b8c
a 1:dd6b440dd85a
--- Branch a
changeset: 1:dd6b440dd85a
branch: a
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: Adding a branch
---- Branch b
changeset: 4:22df7444f7c1
branch: b
parent: 2:ac22033332d1
user: test
date: Thu Jan 01 00:00:04 1970 +0000
summary: Adding b branch head 2
changeset: 3:aee39cd168d0
branch: b
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: Adding b branch head 1
changeset: 2:ac22033332d1
branch: b
parent: 0:19709c5a4e75
user: test
date: Thu Jan 01 00:00:02 1970 +0000
summary: Adding b branch