mercurial: tests/test-subrepo.t@e174353e8cda (annotated)

15321 e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15265 diff changeset	1	Let commit recurse into subrepos by default to match pre-2.0 behavior:
e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15265 diff changeset	2
e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15265 diff changeset	3	$ echo "[ui]" >> $HGRCPATH
e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15265 diff changeset	4	$ echo "commitsubrepos = Yes" >> $HGRCPATH
e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15265 diff changeset	5
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	6	$ rm -rf sub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	7	$ mkdir sub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	8	$ cd sub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	9	$ hg init t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	10	$ cd t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	11
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	12	first revision, no sub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	13
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	14	$ echo a > a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	15	$ hg ci -Am0
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	16	adding a
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	17
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	18	add first sub
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	19
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	20	$ echo s = s > .hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	21	$ hg add .hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	22	$ hg init s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	23	$ echo a > s/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	24
12399 4fee1fd3de9a tests: added a short description to issue numbers Martin Geisler <mg@aragost.com> parents: 12376 diff changeset	25	Issue2232: committing a subrepo without .hgsub
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	26
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	27	$ hg ci -mbad s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	28	abort: can't commit subrepos without .hgsub
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	29	[255]
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	30
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	31	$ hg -R s ci -Ams0
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	32	adding a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	33	$ hg sum
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	34	parent: 0:f7b1eb17ad24 tip
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	35	0
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	36	branch: default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	37	commit: 1 added, 1 subrepos
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	38	update: (current)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	39	$ hg ci -m1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	40	committing subrepository s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	41
15265 460135339d74 revert: warn that subrepos cannot be reverted Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15231 diff changeset	42	Revert can't (yet) revert subrepos:
460135339d74 revert: warn that subrepos cannot be reverted Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15231 diff changeset	43
460135339d74 revert: warn that subrepos cannot be reverted Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15231 diff changeset	44	$ echo b > s/a
460135339d74 revert: warn that subrepos cannot be reverted Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15231 diff changeset	45	$ hg revert s
460135339d74 revert: warn that subrepos cannot be reverted Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15231 diff changeset	46	s: reverting subrepos is unsupported
460135339d74 revert: warn that subrepos cannot be reverted Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15231 diff changeset	47
460135339d74 revert: warn that subrepos cannot be reverted Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15231 diff changeset	48	Revert currently ignores subrepos by default
460135339d74 revert: warn that subrepos cannot be reverted Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15231 diff changeset	49
460135339d74 revert: warn that subrepos cannot be reverted Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15231 diff changeset	50	$ hg revert -a
460135339d74 revert: warn that subrepos cannot be reverted Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15231 diff changeset	51	$ hg revert -R s -a -C
460135339d74 revert: warn that subrepos cannot be reverted Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15231 diff changeset	52	reverting s/a
460135339d74 revert: warn that subrepos cannot be reverted Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15231 diff changeset	53
12399 4fee1fd3de9a tests: added a short description to issue numbers Martin Geisler <mg@aragost.com> parents: 12376 diff changeset	54	Issue2022: update -C
11485 b602a95c21ec subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232) Matt Mackall <mpm@selenic.com> parents: 11470 diff changeset	55
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	56	$ echo b > s/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	57	$ hg sum
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	58	parent: 1:7cf8cfea66e4 tip
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	59	1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	60	branch: default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	61	commit: 1 subrepos
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	62	update: (current)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	63	$ hg co -C 1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	64	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	65	$ hg sum
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	66	parent: 1:7cf8cfea66e4 tip
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	67	1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	68	branch: default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	69	commit: (clean)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	70	update: (current)
11485 b602a95c21ec subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232) Matt Mackall <mpm@selenic.com> parents: 11470 diff changeset	71
15231 cd6f10dccf16 cmdutil.bailifchanged: abort for dirty subrepos Eric Roshan Eisner <ede@alum.mit.edu> parents: 14536 diff changeset	72	commands that require a clean repo should respect subrepos
cd6f10dccf16 cmdutil.bailifchanged: abort for dirty subrepos Eric Roshan Eisner <ede@alum.mit.edu> parents: 14536 diff changeset	73
cd6f10dccf16 cmdutil.bailifchanged: abort for dirty subrepos Eric Roshan Eisner <ede@alum.mit.edu> parents: 14536 diff changeset	74	$ echo b >> s/a
cd6f10dccf16 cmdutil.bailifchanged: abort for dirty subrepos Eric Roshan Eisner <ede@alum.mit.edu> parents: 14536 diff changeset	75	$ hg backout tip
cd6f10dccf16 cmdutil.bailifchanged: abort for dirty subrepos Eric Roshan Eisner <ede@alum.mit.edu> parents: 14536 diff changeset	76	abort: uncommitted changes in subrepo s
cd6f10dccf16 cmdutil.bailifchanged: abort for dirty subrepos Eric Roshan Eisner <ede@alum.mit.edu> parents: 14536 diff changeset	77	[255]
cd6f10dccf16 cmdutil.bailifchanged: abort for dirty subrepos Eric Roshan Eisner <ede@alum.mit.edu> parents: 14536 diff changeset	78	$ hg revert -C -R s s/a
cd6f10dccf16 cmdutil.bailifchanged: abort for dirty subrepos Eric Roshan Eisner <ede@alum.mit.edu> parents: 14536 diff changeset	79
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	80	add sub sub
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	81
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	82	$ echo ss = ss > s/.hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	83	$ hg init s/ss
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	84	$ echo a > s/ss/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	85	$ hg -R s add s/.hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	86	$ hg -R s/ss add s/ss/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	87	$ hg sum
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	88	parent: 1:7cf8cfea66e4 tip
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	89	1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	90	branch: default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	91	commit: 1 subrepos
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	92	update: (current)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	93	$ hg ci -m2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	94	committing subrepository s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	95	committing subrepository s/ss
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	96	$ hg sum
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	97	parent: 2:df30734270ae tip
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	98	2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	99	branch: default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	100	commit: (clean)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	101	update: (current)
11470 34e33d50c26b subrepo: correctly handle update -C with modified subrepos (issue2022) Matt Mackall <mpm@selenic.com> parents: 11088 diff changeset	102
13411 d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no Patrick Mezard <pmezard@gmail.com> parents: 13322 diff changeset	103	bump sub rev (and check it is ignored by ui.commitsubrepos)
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	104
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	105	$ echo b > s/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	106	$ hg -R s ci -ms1
13411 d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no Patrick Mezard <pmezard@gmail.com> parents: 13322 diff changeset	107	$ hg --config ui.commitsubrepos=no ci -m3
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	108	committing subrepository s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	109
13411 d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no Patrick Mezard <pmezard@gmail.com> parents: 13322 diff changeset	110	leave sub dirty (and check ui.commitsubrepos=no aborts the commit)
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	111
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	112	$ echo c > s/a
13411 d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no Patrick Mezard <pmezard@gmail.com> parents: 13322 diff changeset	113	$ hg --config ui.commitsubrepos=no ci -m4
d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no Patrick Mezard <pmezard@gmail.com> parents: 13322 diff changeset	114	abort: uncommitted changes in subrepo s
15321 e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15265 diff changeset	115	(use --subrepos for recursive commit)
13411 d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no Patrick Mezard <pmezard@gmail.com> parents: 13322 diff changeset	116	[255]
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	117	$ hg ci -m4
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	118	committing subrepository s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	119	$ hg tip -R s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	120	changeset: 3:1c833a7a9e3a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	121	tag: tip
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	122	user: test
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	123	date: Thu Jan 01 00:00:00 1970 +0000
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	124	summary: 4
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	125
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	126
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	127	check caching
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	128
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	129	$ hg co 0
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	130	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	131	$ hg debugsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	132
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	133	restore
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	134
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	135	$ hg co
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	136	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	137	$ hg debugsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	138	path s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	139	source s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	140	revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	141
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	142	new branch for merge tests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	143
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	144	$ hg co 1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	145	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	146	$ echo t = t >> .hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	147	$ hg init t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	148	$ echo t > t/t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	149	$ hg -R t add t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	150	adding t/t
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	151
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	152	5
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	153
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	154	$ hg ci -m5 # add sub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	155	committing subrepository t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	156	created new head
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	157	$ echo t2 > t/t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	158
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	159	6
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	160
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	161	$ hg st -R s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	162	$ hg ci -m6 # change sub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	163	committing subrepository t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	164	$ hg debugsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	165	path s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	166	source s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	167	revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	168	path t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	169	source t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	170	revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	171	$ echo t3 > t/t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	172
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	173	7
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	174
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	175	$ hg ci -m7 # change sub again for conflict test
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	176	committing subrepository t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	177	$ hg rm .hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	178
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	179	8
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	180
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	181	$ hg ci -m8 # remove sub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	182
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	183	merge tests
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	184
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	185	$ hg co -C 3
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	186	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	187	$ hg merge 5 # test adding
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	188	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	189	(branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	190	$ hg debugsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	191	path s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	192	source s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	193	revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	194	path t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	195	source t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	196	revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	197	$ hg ci -m9
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	198	created new head
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	199	$ hg merge 6 --debug # test change
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	200	searching for copies back to rev 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	201	resolving manifests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	202	overwrite None partial False
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	203	ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	204	.hgsubstate: versions differ -> m
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	205	updating: .hgsubstate 1/1 files (100.00%)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	206	subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	207	subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	208	getting subrepo t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	209	resolving manifests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	210	overwrite True partial False
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	211	ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	212	t: remote is newer -> g
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	213	updating: t 1/1 files (100.00%)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	214	getting t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	215	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	216	(branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	217	$ hg debugsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	218	path s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	219	source s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	220	revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	221	path t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	222	source t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	223	revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	224	$ echo conflict > t/t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	225	$ hg ci -m10
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	226	committing subrepository t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	227	$ HGMERGE=internal:merge hg merge --debug 7 # test conflict
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	228	searching for copies back to rev 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	229	resolving manifests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	230	overwrite None partial False
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	231	ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	232	.hgsubstate: versions differ -> m
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	233	updating: .hgsubstate 1/1 files (100.00%)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	234	subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	235	subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	236	merging subrepo t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	237	searching for copies back to rev 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	238	resolving manifests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	239	overwrite None partial False
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	240	ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	241	t: versions differ -> m
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	242	preserving t for resolve of t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	243	updating: t 1/1 files (100.00%)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	244	picked tool 'internal:merge' for t (binary False symlink False)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	245	merging t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	246	my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	247	warning: conflicts during merge.
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	248	merging t failed!
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	249	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
12314 f2daa6ab514a merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Brodie Rao <brodie@bitheap.org> parents: 12127 diff changeset	250	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	251	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	252	(branch merge, don't forget to commit)
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	253
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	254	should conflict
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	255
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	256	$ cat t/t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	257	<<<<<<< local
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	258	conflict
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	259	=======
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	260	t3
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	261	>>>>>>> other
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	262
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	263	clone
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	264
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	265	$ cd ..
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	266	$ hg clone t tc
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	267	updating to branch default
14281 ccb7240acf32 subrepo: create subrepos using clone instead of pull Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	268	cloning subrepo s from $TESTTMP/sub/t/s
ccb7240acf32 subrepo: create subrepos using clone instead of pull Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	269	cloning subrepo s/ss from $TESTTMP/sub/t/s/ss
ccb7240acf32 subrepo: create subrepos using clone instead of pull Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	270	cloning subrepo t from $TESTTMP/sub/t/t
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	271	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	272	$ cd tc
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	273	$ hg debugsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	274	path s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	275	source s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	276	revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	277	path t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	278	source t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	279	revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	280
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	281	push
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	282
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	283	$ echo bah > t/t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	284	$ hg ci -m11
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	285	committing subrepository t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	286	$ hg push
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12587 diff changeset	287	pushing to $TESTTMP/sub/t
6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12587 diff changeset	288	pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	289	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	290	no changes found
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12587 diff changeset	291	pushing subrepo s to $TESTTMP/sub/t/s
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	292	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	293	no changes found
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12587 diff changeset	294	pushing subrepo t to $TESTTMP/sub/t/t
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	295	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	296	adding changesets
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	297	adding manifests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	298	adding file changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	299	added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	300	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	301	adding changesets
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	302	adding manifests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	303	adding file changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	304	added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	305
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	306	push -f
10251 a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8816 diff changeset	307
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	308	$ echo bah > s/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	309	$ hg ci -m12
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	310	committing subrepository s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	311	$ hg push
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12587 diff changeset	312	pushing to $TESTTMP/sub/t
6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12587 diff changeset	313	pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	314	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	315	no changes found
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12587 diff changeset	316	pushing subrepo s to $TESTTMP/sub/t/s
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	317	searching for changes
14525 826a13720fbc prepush: print short hash of first new head in abort message Adrian Buehlmann <adrian@cadifra.com> parents: 14361 diff changeset	318	abort: push creates new remote head 12a213df6fa9!
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	319	(did you forget to merge? use push -f to force)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	320	[255]
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	321	$ hg push -f
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12587 diff changeset	322	pushing to $TESTTMP/sub/t
6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12587 diff changeset	323	pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	324	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	325	no changes found
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12587 diff changeset	326	pushing subrepo s to $TESTTMP/sub/t/s
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	327	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	328	adding changesets
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	329	adding manifests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	330	adding file changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	331	added 1 changesets with 1 changes to 1 files (+1 heads)
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12587 diff changeset	332	pushing subrepo t to $TESTTMP/sub/t/t
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	333	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	334	no changes found
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	335	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	336	adding changesets
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	337	adding manifests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	338	adding file changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	339	added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	340
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	341	update
10177 5ca0d220ae21 subrepo: add table-based dispatch for subrepo types Augie Fackler <durin42@gmail.com> parents: 8816 diff changeset	342
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	343	$ cd ../t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	344	$ hg up -C # discard our earlier merge
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	345	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	346	$ echo blah > t/t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	347	$ hg ci -m13
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	348	committing subrepository t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	349
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	350	pull
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	351
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	352	$ cd ../tc
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	353	$ hg pull
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12587 diff changeset	354	pulling from $TESTTMP/sub/t
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	355	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	356	adding changesets
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	357	adding manifests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	358	adding file changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	359	added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	360	(run 'hg update' to get a working copy)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	361
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	362	should pull t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	363
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	364	$ hg up
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12587 diff changeset	365	pulling subrepo t from $TESTTMP/sub/t/t
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	366	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	367	adding changesets
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	368	adding manifests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	369	adding file changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	370	added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	371	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	372	$ cat t/t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	373	blah
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	374
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	375	bogus subrepo path aborts
10251 a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8816 diff changeset	376
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	377	$ echo 'bogus=[boguspath' >> .hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	378	$ hg ci -m 'bogus subrepo path'
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	379	abort: missing ] in subrepo source
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	380	[255]
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	381
12399 4fee1fd3de9a tests: added a short description to issue numbers Martin Geisler <mg@aragost.com> parents: 12376 diff changeset	382	Issue1986: merge aborts when trying to merge a subrepo that
4fee1fd3de9a tests: added a short description to issue numbers Martin Geisler <mg@aragost.com> parents: 12376 diff changeset	383	shouldn't need merging
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	384
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	385	# subrepo layout
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	386	#
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	387	# o 5 br
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	388	# /\|
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	389	# o \| 4 default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	390	# \| \|
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	391	# \| o 3 br
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	392	# \|/\|
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	393	# o \| 2 default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	394	# \| \|
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	395	# \| o 1 br
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	396	# \|/
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	397	# o 0 default
10251 a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8816 diff changeset	398
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	399	$ cd ..
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	400	$ rm -rf sub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	401	$ hg init main
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	402	$ cd main
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	403	$ hg init s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	404	$ cd s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	405	$ echo a > a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	406	$ hg ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	407	adding a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	408	$ hg branch br
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	409	marked working directory as branch br
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	410	$ echo a >> a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	411	$ hg ci -m1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	412	$ hg up default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	413	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	414	$ echo b > b
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	415	$ hg ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	416	adding b
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	417	$ hg up br
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	418	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	419	$ hg merge tip
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	420	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	421	(branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	422	$ hg ci -m1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	423	$ hg up 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	424	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	425	$ echo c > c
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	426	$ hg ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	427	adding c
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	428	$ hg up 3
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	429	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	430	$ hg merge 4
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	431	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	432	(branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	433	$ hg ci -m1
10251 a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8816 diff changeset	434
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	435	# main repo layout:
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	436	#
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	437	# * <-- try to merge default into br again
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	438	# .`\|
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	439	# . o 5 br --> substate = 5
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	440	# . \|
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	441	# o \| 4 default --> substate = 4
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	442	# \| \|
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	443	# \| o 3 br --> substate = 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	444	# \|/\|
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	445	# o \| 2 default --> substate = 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	446	# \| \|
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	447	# \| o 1 br --> substate = 3
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	448	# \|/
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	449	# o 0 default --> substate = 2
10378 e1401c74572f subrepo: change default path in hgrc of subrepo after cloning Saint Germain <saintger@gmail.com> parents: 10252 diff changeset	450
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	451	$ cd ..
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	452	$ echo 's = s' > .hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	453	$ hg -R s up 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	454	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	455	$ hg ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	456	adding .hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	457	committing subrepository s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	458	$ hg branch br
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	459	marked working directory as branch br
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	460	$ echo b > b
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	461	$ hg -R s up 3
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	462	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	463	$ hg ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	464	adding b
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	465	committing subrepository s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	466	$ hg up default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	467	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	468	$ echo c > c
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	469	$ hg ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	470	adding c
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	471	$ hg up 1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	472	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	473	$ hg merge 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	474	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	475	(branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	476	$ hg ci -m1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	477	$ hg up 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	478	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	479	$ hg -R s up 4
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	480	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	481	$ echo d > d
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	482	$ hg ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	483	adding d
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	484	committing subrepository s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	485	$ hg up 3
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	486	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	487	$ hg -R s up 5
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	488	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	489	$ echo e > e
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	490	$ hg ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	491	adding e
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	492	committing subrepository s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	493
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	494	$ hg up 5
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	495	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	496	$ hg merge 4 # try to merge default into br again
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	497	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	498	(branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	499	$ cd ..
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	500
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	501	test subrepo delete from .hgsubstate
10522 b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10468 diff changeset	502
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	503	$ hg init testdelete
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	504	$ mkdir testdelete/nested testdelete/nested2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	505	$ hg init testdelete/nested
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	506	$ hg init testdelete/nested2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	507	$ echo test > testdelete/nested/foo
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	508	$ echo test > testdelete/nested2/foo
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	509	$ hg -R testdelete/nested add
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	510	adding testdelete/nested/foo
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	511	$ hg -R testdelete/nested2 add
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	512	adding testdelete/nested2/foo
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	513	$ hg -R testdelete/nested ci -m test
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	514	$ hg -R testdelete/nested2 ci -m test
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	515	$ echo nested = nested > testdelete/.hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	516	$ echo nested2 = nested2 >> testdelete/.hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	517	$ hg -R testdelete add
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	518	adding testdelete/.hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	519	$ hg -R testdelete ci -m "nested 1 & 2 added"
12127 36a65283c3af commit: sort subrepos before committing for stable test output Martin Geisler <mg@lazybytes.net> parents: 11912 diff changeset	520	committing subrepository nested
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	521	committing subrepository nested2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	522	$ echo nested = nested > testdelete/.hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	523	$ hg -R testdelete ci -m "nested 2 deleted"
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	524	$ cat testdelete/.hgsubstate
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	525	bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	526	$ hg -R testdelete remove testdelete/.hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	527	$ hg -R testdelete ci -m ".hgsub deleted"
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	528	$ cat testdelete/.hgsubstate
14536 52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	529	bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	530
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	531	test repository cloning
10251 a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8816 diff changeset	532
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	533	$ mkdir mercurial mercurial2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	534	$ hg init nested_absolute
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	535	$ echo test > nested_absolute/foo
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	536	$ hg -R nested_absolute add
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	537	adding nested_absolute/foo
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	538	$ hg -R nested_absolute ci -mtest
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	539	$ cd mercurial
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	540	$ hg init nested_relative
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	541	$ echo test2 > nested_relative/foo2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	542	$ hg -R nested_relative add
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	543	adding nested_relative/foo2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	544	$ hg -R nested_relative ci -mtest2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	545	$ hg init main
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	546	$ echo "nested_relative = ../nested_relative" > main/.hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	547	$ echo "nested_absolute = `pwd`/nested_absolute" >> main/.hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	548	$ hg -R main add
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	549	adding main/.hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	550	$ hg -R main ci -m "add subrepos"
12127 36a65283c3af commit: sort subrepos before committing for stable test output Martin Geisler <mg@lazybytes.net> parents: 11912 diff changeset	551	committing subrepository nested_absolute
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	552	committing subrepository nested_relative
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	553	$ cd ..
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	554	$ hg clone mercurial/main mercurial2/main
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	555	updating to branch default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	556	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	557	$ cat mercurial2/main/nested_absolute/.hg/hgrc \
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	558	> mercurial2/main/nested_relative/.hg/hgrc
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	559	[paths]
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12587 diff changeset	560	default = $TESTTMP/sub/mercurial/nested_absolute
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	561	[paths]
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12587 diff changeset	562	default = $TESTTMP/sub/mercurial/nested_relative
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	563	$ rm -rf mercurial mercurial2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	564
12399 4fee1fd3de9a tests: added a short description to issue numbers Martin Geisler <mg@aragost.com> parents: 12376 diff changeset	565	Issue1977: multirepo push should fail if subrepo push fails
11069 12f04d18143e subrepo: add test for issue1977 Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10775 diff changeset	566
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	567	$ hg init repo
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	568	$ hg init repo/s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	569	$ echo a > repo/s/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	570	$ hg -R repo/s ci -Am0
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	571	adding a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	572	$ echo s = s > repo/.hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	573	$ hg -R repo ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	574	adding .hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	575	committing subrepository s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	576	$ hg clone repo repo2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	577	updating to branch default
14281 ccb7240acf32 subrepo: create subrepos using clone instead of pull Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	578	cloning subrepo s from $TESTTMP/sub/repo/s
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	579	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	580	$ hg -q -R repo2 pull -u
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	581	$ echo 1 > repo2/s/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	582	$ hg -R repo2/s ci -m2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	583	$ hg -q -R repo2/s push
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	584	$ hg -R repo2/s up -C 0
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	585	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	586	$ echo 2 > repo2/s/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	587	$ hg -R repo2/s ci -m3
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	588	created new head
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	589	$ hg -R repo2 ci -m3
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	590	committing subrepository s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	591	$ hg -q -R repo2 push
14525 826a13720fbc prepush: print short hash of first new head in abort message Adrian Buehlmann <adrian@cadifra.com> parents: 14361 diff changeset	592	abort: push creates new remote head 9d66565e64e1!
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	593	(did you forget to merge? use push -f to force)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	594	[255]
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	595	$ hg -R repo update
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	596	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	597	$ rm -rf repo2 repo
12753 ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	598
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	599
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	600	Issue1852 subrepos with relative paths always push/pull relative to default
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	601
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	602	Prepare a repo with subrepo
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	603
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	604	$ hg init issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	605	$ cd issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	606	$ hg init sub/repo
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	607	$ echo test > sub/repo/foo
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	608	$ hg -R sub/repo add sub/repo/foo
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	609	$ echo sub/repo = sub/repo > .hgsub
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	610	$ hg add .hgsub
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	611	$ hg ci -mtest
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	612	committing subrepository sub/repo
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	613	$ echo test >> sub/repo/foo
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	614	$ hg ci -mtest
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	615	committing subrepository sub/repo
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	616	$ cd ..
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	617
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	618	Create repo without default path, pull top repo, and see what happens on update
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	619
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	620	$ hg init issue1852b
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	621	$ hg -R issue1852b pull issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	622	pulling from issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	623	requesting all changes
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	624	adding changesets
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	625	adding manifests
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	626	adding file changes
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	627	added 2 changesets with 3 changes to 2 files
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	628	(run 'hg update' to get a working copy)
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	629	$ hg -R issue1852b update
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	630	abort: default path for subrepository sub/repo not found
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	631	[255]
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	632
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	633	Pull -u now doesn't help
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	634
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	635	$ hg -R issue1852b pull -u issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	636	pulling from issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	637	searching for changes
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	638	no changes found
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	639
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	640	Try the same, but with pull -u
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	641
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	642	$ hg init issue1852c
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	643	$ hg -R issue1852c pull -r0 -u issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	644	pulling from issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	645	adding changesets
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	646	adding manifests
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	647	adding file changes
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	648	added 1 changesets with 2 changes to 2 files
14281 ccb7240acf32 subrepo: create subrepos using clone instead of pull Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	649	cloning subrepo sub/repo from issue1852a/sub/repo
12852 5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	650	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
12753 ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	651
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	652	Try to push from the other side
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	653
12852 5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	654	$ hg -R issue1852a push `pwd`/issue1852c
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	655	pushing to $TESTTMP/sub/issue1852c
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	656	pushing subrepo sub/repo to $TESTTMP/sub/issue1852c/sub/repo
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	657	searching for changes
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	658	no changes found
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	659	searching for changes
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	660	adding changesets
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	661	adding manifests
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	662	adding file changes
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	663	added 1 changesets with 1 changes to 1 files
13233 0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	664
14360 ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	665	Incoming and outgoing should not use the default path:
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	666
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	667	$ hg clone -q issue1852a issue1852d
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	668	$ hg -R issue1852d outgoing --subrepos issue1852c
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	669	comparing with issue1852c
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	670	searching for changes
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	671	no changes found
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	672	comparing with issue1852c/sub/repo
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	673	searching for changes
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	674	no changes found
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	675	[1]
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	676	$ hg -R issue1852d incoming --subrepos issue1852c
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	677	comparing with issue1852c
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	678	searching for changes
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	679	no changes found
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	680	comparing with issue1852c/sub/repo
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	681	searching for changes
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	682	no changes found
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	683	[1]
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	684
13233 0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	685	Check status of files when none of them belong to the first
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	686	subrepository:
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	687
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	688	$ hg init subrepo-status
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	689	$ cd subrepo-status
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	690	$ hg init subrepo-1
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	691	$ hg init subrepo-2
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	692	$ cd subrepo-2
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	693	$ touch file
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	694	$ hg add file
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	695	$ cd ..
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	696	$ echo subrepo-1 = subrepo-1 > .hgsub
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	697	$ echo subrepo-2 = subrepo-2 >> .hgsub
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	698	$ hg add .hgsub
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	699	$ hg ci -m 'Added subrepos'
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	700	committing subrepository subrepo-1
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	701	committing subrepository subrepo-2
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	702	$ hg st subrepo-2/file
13322 c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	703
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	704	Check hg update --clean
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	705	$ cd $TESTTMP/sub/t
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	706	$ rm -r t/t.orig
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	707	$ hg status -S --all
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	708	C .hgsub
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	709	C .hgsubstate
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	710	C a
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	711	C s/.hgsub
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	712	C s/.hgsubstate
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	713	C s/a
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	714	C s/ss/a
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	715	C t/t
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	716	$ echo c1 > s/a
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	717	$ cd s
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	718	$ echo c1 > b
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	719	$ echo c1 > c
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	720	$ hg add b
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	721	$ cd ..
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	722	$ hg status -S
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	723	M s/a
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	724	A s/b
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	725	? s/c
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	726	$ hg update -C
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	727	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	728	$ hg status -S
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	729	? s/b
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	730	? s/c
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	731
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	732	Sticky subrepositories, no changes
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	733	$ cd $TESTTMP/sub/t
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	734	$ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	735	925c17564ef8 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	736	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	737	12a213df6fa9 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	738	$ hg -R t id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	739	52c0adc0515a tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	740	$ hg update 11
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	741	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	742	$ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	743	365661e5936a
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	744	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	745	fc627a69481f
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	746	$ hg -R t id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	747	e95bcfa18a35
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	748
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	749	Sticky subrepositorys, file changes
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	750	$ touch s/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	751	$ touch t/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	752	$ hg add -S s/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	753	$ hg add -S t/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	754	$ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	755	365661e5936a
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	756	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	757	fc627a69481f+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	758	$ hg -R t id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	759	e95bcfa18a35+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	760	$ hg update tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	761	subrepository sources for s differ
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	762	use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)?
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	763	l
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	764	subrepository sources for t differ
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	765	use (l)ocal source (e95bcfa18a35) or (r)emote source (52c0adc0515a)?
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	766	l
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	767	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	768	$ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	769	925c17564ef8+ tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	770	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	771	fc627a69481f+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	772	$ hg -R t id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	773	e95bcfa18a35+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	774	$ hg update --clean tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	775	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	776
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	777	Sticky subrepository, revision updates
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	778	$ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	779	925c17564ef8 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	780	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	781	12a213df6fa9 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	782	$ hg -R t id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	783	52c0adc0515a tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	784	$ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	785	$ hg update -r -2
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	786	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	787	$ cd ../t
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	788	$ hg update -r 2
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	789	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	790	$ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	791	$ hg update 10
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	792	subrepository sources for t differ (in checked out version)
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	793	use (l)ocal source (7af322bc1198) or (r)emote source (20a0db6fbf6c)?
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	794	l
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	795	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	796	$ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	797	e45c8b14af55+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	798	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	799	1c833a7a9e3a
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	800	$ hg -R t id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	801	7af322bc1198
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	802
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	803	Sticky subrepository, file changes and revision updates
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	804	$ touch s/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	805	$ touch t/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	806	$ hg add -S s/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	807	$ hg add -S t/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	808	$ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	809	e45c8b14af55+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	810	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	811	1c833a7a9e3a+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	812	$ hg -R t id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	813	7af322bc1198+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	814	$ hg update tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	815	subrepository sources for s differ
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	816	use (l)ocal source (1c833a7a9e3a) or (r)emote source (12a213df6fa9)?
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	817	l
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	818	subrepository sources for t differ
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	819	use (l)ocal source (7af322bc1198) or (r)emote source (52c0adc0515a)?
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	820	l
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	821	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	822	$ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	823	925c17564ef8 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	824	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	825	1c833a7a9e3a+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	826	$ hg -R t id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	827	7af322bc1198+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	828
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	829	Sticky repository, update --clean
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	830	$ hg update --clean tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	831	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	832	$ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	833	925c17564ef8 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	834	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	835	12a213df6fa9 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	836	$ hg -R t id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	837	52c0adc0515a tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	838
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	839	Test subrepo already at intended revision:
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	840	$ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	841	$ hg update fc627a69481f
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	842	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	843	$ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	844	$ hg update 11
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	845	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	846	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	847	$ hg id -n
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	848	11+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	849	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	850	fc627a69481f
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	851	$ hg -R t id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	852	e95bcfa18a35
14536 52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	853
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	854	Test that removing .hgsubstate doesn't break anything:
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	855
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	856	$ hg rm -f .hgsubstate
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	857	$ hg ci -mrm
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	858	committing subrepository s
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	859	committing subrepository t
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	860	created new head
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	861	$ hg log -vr tip
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	862	changeset: 14:3941e0aa5236
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	863	tag: tip
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	864	parent: 11:365661e5936a
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	865	user: test
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	866	date: Thu Jan 01 00:00:00 1970 +0000
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	867	description:
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	868	rm
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	869
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	870
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	871
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	872	Test that removing .hgsub removes .hgsubstate:
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	873
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	874	$ hg rm .hgsub
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	875	$ hg ci -mrm2
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	876	$ hg log -vr tip
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	877	changeset: 15:8b31de9d13d1
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	878	tag: tip
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	879	user: test
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	880	date: Thu Jan 01 00:00:00 1970 +0000
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	881	files: .hgsub .hgsubstate
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	882	description:
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	883	rm2
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	884
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	885

author	Martin Geisler <mg@lazybytes.net>
	Fri, 21 Oct 2011 00:33:08 +0200
branch	stable
changeset 15321	e174353e8cda
parent 15265	460135339d74
child 15409	83c2e6772408
child 15615	41885892796e
permissions	-rw-r--r--