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

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

merge with crew
merge with crew
Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default
r6986:55c16f12 merge default
Show More
test-parents.out
96 lines | 2.3 KiB | text/plain | TextLexer
/ tests / test-parents.out
History | Source | Raw |Copy content |Copy permalink
Brendan Cully
Make parents with a file but not a revision use working directory revision.
 r4584 % no working directory
adding a
adding b
Patrick Mezard
Test parents behaviour with files.
 r5299 adding c
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding c
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Patrick Mezard
Test parents behaviour with files.
 r5299 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Brendan Cully
Make parents with a file but not a revision use working directory revision.
 r4584 % hg parents
Patrick Mezard
Test parents behaviour with files.
 r5299 changeset: 3:02d851b7e549
Brendan Cully
Make parents with a file but not a revision use working directory revision.
 r4584 user: test
Patrick Mezard
Test parents behaviour with files.
 r5299 date: Thu Jan 01 00:00:03 1970 +0000
summary: c
Brendan Cully
Make parents with a file but not a revision use working directory revision.
 r4584
% hg parents a
Patrick Mezard
Test parents behaviour with files.
 r5299 changeset: 1:d786049f033a
Brendan Cully
Make parents with a file but not a revision use working directory revision.
 r4584 user: test
Patrick Mezard
Test parents behaviour with files.
 r5299 date: Thu Jan 01 00:00:01 1970 +0000
summary: a
Brendan Cully
Make parents with a file but not a revision use working directory revision.
 r4584
Patrick Mezard
Test parents behaviour with files.
 r5299 % hg parents c, single revision
changeset: 3:02d851b7e549
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: c
% hg parents -r 3 c
abort: 'c' not found in manifest!
Brendan Cully
Make parents with a file but not a revision use working directory revision.
 r4584 % hg parents -r 2
changeset: 1:d786049f033a
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: a
% hg parents -r 2 a
Patrick Mezard
Test parents behaviour with files.
 r5299 changeset: 1:d786049f033a
Brendan Cully
Make parents with a file but not a revision use working directory revision.
 r4584 user: test
Patrick Mezard
Test parents behaviour with files.
 r5299 date: Thu Jan 01 00:00:01 1970 +0000
summary: a
Brendan Cully
Make parents with a file but not a revision use working directory revision.
 r4584
Alexis S. L. Carvalho
hg parents: don't pass an OS-specific path to repo.filectx...
 r4894 % hg parents -r 2 ../a
abort: ../a not under root
% cd dir; hg parents -r 2 ../a
Patrick Mezard
Test parents behaviour with files.
 r5299 changeset: 1:d786049f033a
Alexis S. L. Carvalho
hg parents: don't pass an OS-specific path to repo.filectx...
 r4894 user: test
Patrick Mezard
Test parents behaviour with files.
 r5299 date: Thu Jan 01 00:00:01 1970 +0000
summary: a
Alexis S. L. Carvalho
hg parents: don't pass an OS-specific path to repo.filectx...
 r4894
% hg parents -r 2 path:a
Patrick Mezard
Test parents behaviour with files.
 r5299 changeset: 1:d786049f033a
Alexis S. L. Carvalho
hg parents: don't pass an OS-specific path to repo.filectx...
 r4894 user: test
Patrick Mezard
Test parents behaviour with files.
 r5299 date: Thu Jan 01 00:00:01 1970 +0000
summary: a
Alexis S. L. Carvalho
hg parents: don't pass an OS-specific path to repo.filectx...
 r4894
% hg parents -r 2 glob:a
abort: can only specify an explicit file name
Patrick Mezard
Test parents behaviour with files.
 r5299 % merge working dir with 2 parents, hg parents c
merging c
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
changeset: 3:02d851b7e549
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: c
changeset: 4:48cee28d4b4e
tag: tip
parent: 1:d786049f033a
user: test
date: Thu Jan 01 00:00:04 1970 +0000
summary: c2
% merge working dir with 1 parent, hg parents
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
changeset: 2:6cfac479f009
user: test
date: Thu Jan 01 00:00:02 1970 +0000
summary: b
changeset: 4:48cee28d4b4e
tag: tip
parent: 1:d786049f033a
user: test
date: Thu Jan 01 00:00:04 1970 +0000
summary: c2
% merge working dir with 1 parent, hg parents c
changeset: 4:48cee28d4b4e
tag: tip
parent: 1:d786049f033a
user: test
date: Thu Jan 01 00:00:04 1970 +0000
summary: c2