Changeset View

Standalone View

Show First 20 Lines • Show All 48 Lines • ▼ Show 20 Line(s)	hg parents c, single revision
changeset: 3:02d851b7e549		changeset: 3:02d851b7e549
user: test		user: test
date: Thu Jan 01 00:00:03 1970 +0000		date: Thu Jan 01 00:00:03 1970 +0000
summary: c		summary: c


$ hg parents -r 3 c		$ hg parents -r 3 c
abort: 'c' not found in manifest!		abort: 'c' not found in manifest!
[255]		[10]

$ hg parents -r 2		$ hg parents -r 2
changeset: 1:d786049f033a		changeset: 1:d786049f033a
user: test		user: test
date: Thu Jan 01 00:00:01 1970 +0000		date: Thu Jan 01 00:00:01 1970 +0000
summary: a		summary: a


Show All 24 Lines	cd dir; hg parents -r 2 ../a
user: test		user: test
date: Thu Jan 01 00:00:01 1970 +0000		date: Thu Jan 01 00:00:01 1970 +0000
summary: a		summary: a

$ cd ..		$ cd ..

$ hg parents -r 2 glob:a		$ hg parents -r 2 glob:a
abort: can only specify an explicit filename		abort: can only specify an explicit filename
[255]		[10]


merge working dir with 2 parents, hg parents c		merge working dir with 2 parents, hg parents c

$ HGMERGE=true hg merge		$ HGMERGE=true hg merge
merging c		merging c
0 files updated, 1 files merged, 0 files removed, 0 files unresolved		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)		(branch merge, don't forget to commit)
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines