mercurial: tests/test-subrepo.t@aab0c14c20d0 (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	$ hg init t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	7	$ cd t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	8
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	9	first revision, no sub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	10
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	11	$ echo a > a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	12	$ hg ci -Am0
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	13	adding a
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	14
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	15	add first sub
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	16
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	17	$ echo s = s > .hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	18	$ hg add .hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	19	$ hg init s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	20	$ echo a > s/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	21
12399 4fee1fd3de9a tests: added a short description to issue numbers Martin Geisler <mg@aragost.com> parents: 12376 diff changeset	22	Issue2232: committing a subrepo without .hgsub
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	23
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	24	$ hg ci -mbad s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	25	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	26	[255]
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	27
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	28	$ hg -R s ci -Ams0
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	29	adding a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	30	$ hg sum
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	31	parent: 0:f7b1eb17ad24 tip
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	32	0
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	33	branch: default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	34	commit: 1 added, 1 subrepos
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	35	update: (current)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	36	$ hg ci -m1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	37
16454 92c7e917b647 tests: add test for fileset 'subrepo' keyword Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16430 diff changeset	38	Revert subrepo and test subrepo fileset keyword:
15265 460135339d74 revert: warn that subrepos cannot be reverted Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15231 diff changeset	39
460135339d74 revert: warn that subrepos cannot be reverted Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15231 diff changeset	40	$ echo b > s/a
16454 92c7e917b647 tests: add test for fileset 'subrepo' keyword Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16430 diff changeset	41	$ hg revert "set:subrepo('glob:s*')"
16430 6883c2363f44 revert: add support for reverting subrepos without --no-backup and/or --all Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16429 diff changeset	42	reverting subrepo s
16540 4fe8eb4a6e2c tests: add missing accept of native pathname separator Mads Kiilerich <mads@kiilerich.com> parents: 16454 diff changeset	43	reverting s/a (glob)
16430 6883c2363f44 revert: add support for reverting subrepos without --no-backup and/or --all Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16429 diff changeset	44	$ rm s/a.orig
15265 460135339d74 revert: warn that subrepos cannot be reverted Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15231 diff changeset	45
16430 6883c2363f44 revert: add support for reverting subrepos without --no-backup and/or --all Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16429 diff changeset	46	Revert subrepo with no backup. The "reverting s/a" line is gone since
6883c2363f44 revert: add support for reverting subrepos without --no-backup and/or --all Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16429 diff changeset	47	we're really running 'hg update' in the subrepo:
6883c2363f44 revert: add support for reverting subrepos without --no-backup and/or --all Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16429 diff changeset	48
6883c2363f44 revert: add support for reverting subrepos without --no-backup and/or --all Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16429 diff changeset	49	$ echo b > s/a
6883c2363f44 revert: add support for reverting subrepos without --no-backup and/or --all Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16429 diff changeset	50	$ hg revert --no-backup s
6883c2363f44 revert: add support for reverting subrepos without --no-backup and/or --all Angel Ezquerra <angel.ezquerra@gmail.com> parents: 16429 diff changeset	51	reverting subrepo s
15265 460135339d74 revert: warn that subrepos cannot be reverted Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15231 diff changeset	52
12399 4fee1fd3de9a tests: added a short description to issue numbers Martin Geisler <mg@aragost.com> parents: 12376 diff changeset	53	Issue2022: update -C
11485 b602a95c21ec subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232) Matt Mackall <mpm@selenic.com> parents: 11470 diff changeset	54
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	55	$ echo b > s/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	56	$ hg sum
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	57	parent: 1:7cf8cfea66e4 tip
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	58	1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	59	branch: default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	60	commit: 1 subrepos
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	61	update: (current)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	62	$ hg co -C 1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	63	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	64	$ hg sum
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	65	parent: 1:7cf8cfea66e4 tip
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	66	1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	67	branch: default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	68	commit: (clean)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	69	update: (current)
11485 b602a95c21ec subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232) Matt Mackall <mpm@selenic.com> parents: 11470 diff changeset	70
15231 cd6f10dccf16 cmdutil.bailifchanged: abort for dirty subrepos Eric Roshan Eisner <ede@alum.mit.edu> parents: 14536 diff changeset	71	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	72
cd6f10dccf16 cmdutil.bailifchanged: abort for dirty subrepos Eric Roshan Eisner <ede@alum.mit.edu> parents: 14536 diff changeset	73	$ echo b >> s/a
cd6f10dccf16 cmdutil.bailifchanged: abort for dirty subrepos Eric Roshan Eisner <ede@alum.mit.edu> parents: 14536 diff changeset	74	$ hg backout tip
cd6f10dccf16 cmdutil.bailifchanged: abort for dirty subrepos Eric Roshan Eisner <ede@alum.mit.edu> parents: 14536 diff changeset	75	abort: uncommitted changes in subrepo s
cd6f10dccf16 cmdutil.bailifchanged: abort for dirty subrepos Eric Roshan Eisner <ede@alum.mit.edu> parents: 14536 diff changeset	76	[255]
cd6f10dccf16 cmdutil.bailifchanged: abort for dirty subrepos Eric Roshan Eisner <ede@alum.mit.edu> parents: 14536 diff changeset	77	$ 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	78
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	79	add sub sub
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	80
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	81	$ echo ss = ss > s/.hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	82	$ hg init s/ss
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	83	$ echo a > s/ss/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	84	$ hg -R s add s/.hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	85	$ hg -R s/ss add s/ss/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	86	$ hg sum
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	87	parent: 1:7cf8cfea66e4 tip
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	88	1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	89	branch: default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	90	commit: 1 subrepos
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	91	update: (current)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	92	$ hg ci -m2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	93	committing subrepository s
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15410 diff changeset	94	committing subrepository s/ss (glob)
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	95	$ hg sum
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	96	parent: 2:df30734270ae tip
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	97	2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	98	branch: default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	99	commit: (clean)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	100	update: (current)
11470 34e33d50c26b subrepo: correctly handle update -C with modified subrepos (issue2022) Matt Mackall <mpm@selenic.com> parents: 11088 diff changeset	101
13411 d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no Patrick Mezard <pmezard@gmail.com> parents: 13322 diff changeset	102	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	103
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	104	$ echo b > s/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	105	$ 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	106	$ hg --config ui.commitsubrepos=no ci -m3
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	107
13411 d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no Patrick Mezard <pmezard@gmail.com> parents: 13322 diff changeset	108	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	109
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	110	$ 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	111	$ 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	112	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	113	(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	114	[255]
17255 3e856d8abe9c identity: show trailing '+' for dirty subrepos (issue2839) Patrick Mezard <patrick@mezard.eu> parents: 16912 diff changeset	115	$ hg id
3e856d8abe9c identity: show trailing '+' for dirty subrepos (issue2839) Patrick Mezard <patrick@mezard.eu> parents: 16912 diff changeset	116	f6affe3fbfaa+ tip
3e856d8abe9c identity: show trailing '+' for dirty subrepos (issue2839) Patrick Mezard <patrick@mezard.eu> parents: 16912 diff changeset	117	$ hg -R s ci -mc
3e856d8abe9c identity: show trailing '+' for dirty subrepos (issue2839) Patrick Mezard <patrick@mezard.eu> parents: 16912 diff changeset	118	$ hg id
3e856d8abe9c identity: show trailing '+' for dirty subrepos (issue2839) Patrick Mezard <patrick@mezard.eu> parents: 16912 diff changeset	119	f6affe3fbfaa+ tip
3e856d8abe9c identity: show trailing '+' for dirty subrepos (issue2839) Patrick Mezard <patrick@mezard.eu> parents: 16912 diff changeset	120	$ echo d > s/a
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	121	$ hg ci -m4
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	122	committing subrepository s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	123	$ hg tip -R s
17255 3e856d8abe9c identity: show trailing '+' for dirty subrepos (issue2839) Patrick Mezard <patrick@mezard.eu> parents: 16912 diff changeset	124	changeset: 4:02dcf1d70411
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	125	tag: tip
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	126	user: test
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	127	date: Thu Jan 01 00:00:00 1970 +0000
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	128	summary: 4
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	129
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	130
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	131	check caching
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	132
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	133	$ hg co 0
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	134	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	135	$ hg debugsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	136
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	137	restore
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	138
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	139	$ hg co
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	140	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	141	$ hg debugsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	142	path s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	143	source s
17255 3e856d8abe9c identity: show trailing '+' for dirty subrepos (issue2839) Patrick Mezard <patrick@mezard.eu> parents: 16912 diff changeset	144	revision 02dcf1d704118aee3ee306ccfa1910850d5b05ef
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	145
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	146	new branch for merge tests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	147
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	148	$ hg co 1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	149	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	150	$ echo t = t >> .hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	151	$ hg init t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	152	$ echo t > t/t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	153	$ hg -R t add t
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15410 diff changeset	154	adding t/t (glob)
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	155
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	156	5
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	157
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	158	$ hg ci -m5 # add sub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	159	committing subrepository t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	160	created new head
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	161	$ echo t2 > t/t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	162
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	163	6
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	164
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	165	$ hg st -R s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	166	$ hg ci -m6 # change sub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	167	committing subrepository t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	168	$ hg debugsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	169	path s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	170	source s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	171	revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	172	path t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	173	source t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	174	revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	175	$ echo t3 > t/t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	176
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	177	7
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	178
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	179	$ hg ci -m7 # change sub again for conflict test
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	180	committing subrepository t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	181	$ hg rm .hgsub
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	8
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	184
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	185	$ hg ci -m8 # remove sub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	186
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	187	merge tests
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	188
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	189	$ hg co -C 3
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	190	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	191	$ hg merge 5 # test adding
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	192	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	193	(branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	194	$ hg debugsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	195	path s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	196	source s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	197	revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	198	path t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	199	source t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	200	revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	201	$ hg ci -m9
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	202	created new head
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	203	$ hg merge 6 --debug # test change
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	204	searching for copies back to rev 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	205	resolving manifests
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18556 diff changeset	206	branchmerge: True, force: False, partial: False
15625 efdcce3fd2d5 merge: make debug output easier to read Martin Geisler <mg@aragost.com> parents: 15623 diff changeset	207	ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	208	.hgsubstate: versions differ -> m
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	209	updating: .hgsubstate 1/1 files (100.00%)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	210	subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	211	subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	212	getting subrepo t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	213	resolving manifests
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18556 diff changeset	214	branchmerge: False, force: False, partial: False
17895 17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	215	ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	216	t: remote is newer -> g
18631 e2dc5397bc82 tests: update test output (will be folded into parent) Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	217	getting t
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	218	updating: t 1/1 files (100.00%)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	219	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	220	(branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	221	$ hg debugsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	222	path s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	223	source s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	224	revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	225	path t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	226	source t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	227	revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	228	$ echo conflict > t/t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	229	$ hg ci -m10
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	230	committing subrepository t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	231	$ HGMERGE=internal:merge hg merge --debug 7 # test conflict
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	232	searching for copies back to rev 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	233	resolving manifests
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18556 diff changeset	234	branchmerge: True, force: False, partial: False
15625 efdcce3fd2d5 merge: make debug output easier to read Martin Geisler <mg@aragost.com> parents: 15623 diff changeset	235	ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	236	.hgsubstate: versions differ -> m
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	237	updating: .hgsubstate 1/1 files (100.00%)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	238	subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	239	subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	240	merging subrepo t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	241	searching for copies back to rev 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	242	resolving manifests
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18556 diff changeset	243	branchmerge: True, force: False, partial: False
15625 efdcce3fd2d5 merge: make debug output easier to read Martin Geisler <mg@aragost.com> parents: 15623 diff changeset	244	ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	245	t: versions differ -> m
18541 5ed6a375e9ca merge: delay debug messages for merge actions Mads Kiilerich <madski@unity3d.com> parents: 18520 diff changeset	246	preserving t for resolve of t
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	247	updating: t 1/1 files (100.00%)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	248	picked tool 'internal:merge' for t (binary False symlink False)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	249	merging t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	250	my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	251	warning: conflicts during merge.
15501 2371f4aea665 merge: give a special message for internal:merge failure (issue3105) Matt Mackall <mpm@selenic.com> parents: 15474 diff changeset	252	merging t incomplete! (edit conflicts, then use 'hg resolve --mark')
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	253	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	254	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	255	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	256	(branch merge, don't forget to commit)
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	257
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	258	should conflict
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	259
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	260	$ cat t/t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	261	<<<<<<< local
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	262	conflict
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	263	=======
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	264	t3
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	265	>>>>>>> other
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	266
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	267	clone
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	268
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	269	$ cd ..
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	270	$ hg clone t tc
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	271	updating to branch default
18720 0ade08dcb3c3 tests: remove glob lines which unnecessary match / for \ on windows Simon Heimberg <simohe@besonet.ch> parents: 18631 diff changeset	272	cloning subrepo s from $TESTTMP/t/s
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	273	cloning subrepo s/ss from $TESTTMP/t/s/ss (glob)
18720 0ade08dcb3c3 tests: remove glob lines which unnecessary match / for \ on windows Simon Heimberg <simohe@besonet.ch> parents: 18631 diff changeset	274	cloning subrepo t from $TESTTMP/t/t
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	275	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	276	$ cd tc
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	277	$ hg debugsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	278	path s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	279	source s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	280	revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	281	path t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	282	source t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	283	revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e
8816 a7c4eb0cc0ed subrepo: add a test Matt Mackall <mpm@selenic.com> parents: diff changeset	284
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	285	push
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	286
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	287	$ echo bah > t/t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	288	$ hg ci -m11
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	289	committing subrepository t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	290	$ hg push
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	291	pushing to $TESTTMP/t (glob)
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	292	pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	293	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	294	no changes found
18720 0ade08dcb3c3 tests: remove glob lines which unnecessary match / for \ on windows Simon Heimberg <simohe@besonet.ch> parents: 18631 diff changeset	295	pushing subrepo s to $TESTTMP/t/s
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	296	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	297	no changes found
18720 0ade08dcb3c3 tests: remove glob lines which unnecessary match / for \ on windows Simon Heimberg <simohe@besonet.ch> parents: 18631 diff changeset	298	pushing subrepo t to $TESTTMP/t/t
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	299	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	300	adding changesets
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	301	adding manifests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	302	adding file changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	303	added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	304	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	305	adding changesets
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	306	adding manifests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	307	adding file changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	308	added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	309
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	310	push -f
10251 a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8816 diff changeset	311
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	312	$ echo bah > s/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	313	$ hg ci -m12
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	314	committing subrepository s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	315	$ hg push
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	316	pushing to $TESTTMP/t (glob)
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	317	pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	318	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	319	no changes found
18720 0ade08dcb3c3 tests: remove glob lines which unnecessary match / for \ on windows Simon Heimberg <simohe@besonet.ch> parents: 18631 diff changeset	320	pushing subrepo s to $TESTTMP/t/s
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	321	searching for changes
18109 9e3910db4e78 subrepo: append subrepo path to subrepo error messages Angel Ezquerra <angel.ezquerra@gmail.com> parents: 17938 diff changeset	322	abort: push creates new remote head 12a213df6fa9! (in subrepo s)
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	323	(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	324	[255]
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	325	$ hg push -f
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	326	pushing to $TESTTMP/t (glob)
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	327	pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	328	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	329	no changes found
18720 0ade08dcb3c3 tests: remove glob lines which unnecessary match / for \ on windows Simon Heimberg <simohe@besonet.ch> parents: 18631 diff changeset	330	pushing subrepo s to $TESTTMP/t/s
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	331	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	332	adding changesets
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	333	adding manifests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	334	adding file changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	335	added 1 changesets with 1 changes to 1 files (+1 heads)
18720 0ade08dcb3c3 tests: remove glob lines which unnecessary match / for \ on windows Simon Heimberg <simohe@besonet.ch> parents: 18631 diff changeset	336	pushing subrepo t to $TESTTMP/t/t
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	337	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	338	no changes found
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	339	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	340	adding changesets
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	341	adding manifests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	342	adding file changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	343	added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	344
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	345	update
10177 5ca0d220ae21 subrepo: add table-based dispatch for subrepo types Augie Fackler <durin42@gmail.com> parents: 8816 diff changeset	346
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	347	$ cd ../t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	348	$ hg up -C # discard our earlier merge
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	349	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	350	$ echo blah > t/t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	351	$ hg ci -m13
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	352	committing subrepository t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	353
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	354	pull
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	355
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	356	$ cd ../tc
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	357	$ hg pull
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	358	pulling from $TESTTMP/t (glob)
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	359	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	360	adding changesets
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	361	adding manifests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	362	adding file changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	363	added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	364	(run 'hg update' to get a working copy)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	365
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	366	should pull t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	367
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	368	$ hg up
18720 0ade08dcb3c3 tests: remove glob lines which unnecessary match / for \ on windows Simon Heimberg <simohe@besonet.ch> parents: 18631 diff changeset	369	pulling subrepo t from $TESTTMP/t/t
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	370	searching for changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	371	adding changesets
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	372	adding manifests
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	373	adding file changes
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	374	added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	375	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	376	$ cat t/t
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	377	blah
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	378
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	379	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	380
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	381	$ echo 'bogus=[boguspath' >> .hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	382	$ hg ci -m 'bogus subrepo path'
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	383	abort: missing ] in subrepo source
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	384	[255]
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	385
12399 4fee1fd3de9a tests: added a short description to issue numbers Martin Geisler <mg@aragost.com> parents: 12376 diff changeset	386	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	387	shouldn't need merging
11912 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	# subrepo layout
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 5 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 \| 4 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 3 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 \| 2 default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	398	# \| \|
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	399	# \| o 1 br
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	400	# \|/
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	401	# o 0 default
10251 a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8816 diff changeset	402
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	403	$ cd ..
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	404	$ rm -rf sub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	405	$ hg init main
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	406	$ cd main
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	407	$ hg init s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	408	$ cd s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	409	$ echo a > a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	410	$ hg ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	411	adding a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	412	$ hg branch br
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	413	marked working directory as branch br
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 15321 diff changeset	414	(branches are permanent and global, did you want a bookmark?)
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	415	$ echo a >> a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	416	$ hg ci -m1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	417	$ hg up default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	418	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	419	$ echo b > b
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	420	$ hg ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	421	adding b
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	422	$ hg up br
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	423	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	424	$ hg merge tip
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	425	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	426	(branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	427	$ hg ci -m1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	428	$ hg up 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	429	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	430	$ echo c > c
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	431	$ hg ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	432	adding c
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	433	$ hg up 3
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	434	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	435	$ hg merge 4
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	436	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	437	(branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	438	$ hg ci -m1
10251 a19d2993385d subrepo: fix merging of already merged subrepos (issue1986) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8816 diff changeset	439
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	440	# main repo layout:
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	441	#
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	442	# * <-- try to merge default into br again
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	443	# .`\|
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	444	# . o 5 br --> substate = 5
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	445	# . \|
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	446	# o \| 4 default --> substate = 4
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	447	# \| \|
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	448	# \| o 3 br --> substate = 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	449	# \|/\|
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	450	# o \| 2 default --> substate = 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	451	# \| \|
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	452	# \| o 1 br --> substate = 3
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	453	# \|/
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	454	# 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	455
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	456	$ cd ..
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	457	$ echo 's = s' > .hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	458	$ hg -R s up 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	459	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	460	$ hg ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	461	adding .hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	462	$ hg branch br
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	463	marked working directory as branch br
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 15321 diff changeset	464	(branches are permanent and global, did you want a bookmark?)
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	465	$ echo b > b
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	466	$ hg -R s up 3
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	467	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	468	$ hg ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	469	adding b
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	470	$ hg up default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	471	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	472	$ echo c > c
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	473	$ hg ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	474	adding c
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	475	$ hg up 1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	476	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	477	$ hg merge 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	478	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	479	(branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	480	$ hg ci -m1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	481	$ hg up 2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	482	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	483	$ hg -R s up 4
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	484	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	485	$ echo d > d
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	486	$ hg ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	487	adding d
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	488	$ hg up 3
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	489	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	490	$ hg -R s up 5
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	491	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	492	$ echo e > e
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	493	$ hg ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	494	adding e
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	495
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	496	$ hg up 5
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	497	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	498	$ hg merge 4 # try to merge default into br again
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	499	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	500	(branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	501	$ cd ..
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	502
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	503	test subrepo delete from .hgsubstate
10522 b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10468 diff changeset	504
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	505	$ hg init testdelete
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	506	$ mkdir testdelete/nested testdelete/nested2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	507	$ hg init testdelete/nested
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	508	$ hg init testdelete/nested2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	509	$ echo test > testdelete/nested/foo
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	510	$ echo test > testdelete/nested2/foo
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	511	$ hg -R testdelete/nested add
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15410 diff changeset	512	adding testdelete/nested/foo (glob)
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	513	$ hg -R testdelete/nested2 add
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15410 diff changeset	514	adding testdelete/nested2/foo (glob)
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	515	$ hg -R testdelete/nested ci -m test
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	516	$ hg -R testdelete/nested2 ci -m test
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	517	$ echo nested = nested > testdelete/.hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	518	$ echo nested2 = nested2 >> testdelete/.hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	519	$ hg -R testdelete add
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15410 diff changeset	520	adding testdelete/.hgsub (glob)
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	521	$ hg -R testdelete ci -m "nested 1 & 2 added"
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
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15410 diff changeset	537	adding nested_absolute/foo (glob)
11912 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
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15410 diff changeset	543	adding nested_relative/foo2 (glob)
11912 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
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15410 diff changeset	549	adding main/.hgsub (glob)
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	550	$ hg -R main ci -m "add subrepos"
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	551	$ cd ..
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	552	$ hg clone mercurial/main mercurial2/main
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	553	updating to branch default
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	554	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	555	$ cat mercurial2/main/nested_absolute/.hg/hgrc \
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	556	> mercurial2/main/nested_relative/.hg/hgrc
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	557	[paths]
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	558	default = $TESTTMP/mercurial/nested_absolute
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	559	[paths]
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	560	default = $TESTTMP/mercurial/nested_relative
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	561	$ rm -rf mercurial mercurial2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	562
12399 4fee1fd3de9a tests: added a short description to issue numbers Martin Geisler <mg@aragost.com> parents: 12376 diff changeset	563	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	564
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	565	$ hg init repo
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	566	$ hg init repo/s
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	567	$ echo a > repo/s/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	568	$ hg -R repo/s ci -Am0
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	569	adding a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	570	$ echo s = s > repo/.hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	571	$ hg -R repo ci -Am1
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	572	adding .hgsub
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	573	$ hg clone repo repo2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	574	updating to branch default
18720 0ade08dcb3c3 tests: remove glob lines which unnecessary match / for \ on windows Simon Heimberg <simohe@besonet.ch> parents: 18631 diff changeset	575	cloning subrepo s from $TESTTMP/repo/s
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	576	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	577	$ hg -q -R repo2 pull -u
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	578	$ echo 1 > repo2/s/a
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	579	$ hg -R repo2/s ci -m2
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	580	$ hg -q -R repo2/s push
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	581	$ hg -R repo2/s up -C 0
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	582	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17895 17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	583	$ echo 2 > repo2/s/b
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	584	$ hg -R repo2/s ci -m3 -A
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	585	adding b
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	586	created new head
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	587	$ hg -R repo2 ci -m3
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	588	$ hg -q -R repo2 push
18109 9e3910db4e78 subrepo: append subrepo path to subrepo error messages Angel Ezquerra <angel.ezquerra@gmail.com> parents: 17938 diff changeset	589	abort: push creates new remote head cc505f09a8b2! (in subrepo s)
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	590	(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	591	[255]
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	592	$ hg -R repo update
69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	593	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
17895 17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	594
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	595	test if untracked file is not overwritten
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	596
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	597	$ echo issue3276_ok > repo/s/b
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	598	$ hg -R repo2 push -f -q
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	599	$ hg -R repo update
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	600	b: untracked file differs
18109 9e3910db4e78 subrepo: append subrepo path to subrepo error messages Angel Ezquerra <angel.ezquerra@gmail.com> parents: 17938 diff changeset	601	abort: untracked files in working directory differ from files in requested revision (in subrepo s)
17895 17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	602	[255]
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	603
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	604	$ cat repo/s/b
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	605	issue3276_ok
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	606	$ rm repo/s/b
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	607	$ hg -R repo revert --all
17907 ce2c709a8e90 test-subrepo: adapt for Windows after 17c030014ddf Adrian Buehlmann <adrian@cadifra.com> parents: 17895 diff changeset	608	reverting repo/.hgsubstate (glob)
17895 17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	609	reverting subrepo s
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	610	$ hg -R repo update
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	611	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	612	$ cat repo/s/b
17c030014ddf subrepo: only do clean update when overwrite is set (issue3276) Simon Heimberg <simohe@besonet.ch> parents: 17345 diff changeset	613	2
11912 69678985bdba tests: unify test-subrepo Martin Geisler <mg@lazybytes.net> parents: 11485 diff changeset	614	$ 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	615
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	616
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	617	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	618
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	619	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	620
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	621	$ hg init issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	622	$ cd issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	623	$ hg init sub/repo
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	624	$ 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	625	$ 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	626	$ 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	627	$ hg add .hgsub
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	628	$ hg ci -mtest
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15410 diff changeset	629	committing subrepository sub/repo (glob)
12753 ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	630	$ 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	631	$ hg ci -mtest
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15410 diff changeset	632	committing subrepository sub/repo (glob)
12753 ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	633	$ cd ..
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	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	636
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	637	$ hg init issue1852b
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	638	$ 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	639	pulling from issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	640	requesting all changes
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	641	adding changesets
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	642	adding manifests
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	643	adding file changes
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	644	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	645	(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	646	$ hg -R issue1852b update
18109 9e3910db4e78 subrepo: append subrepo path to subrepo error messages Angel Ezquerra <angel.ezquerra@gmail.com> parents: 17938 diff changeset	647	abort: default path for subrepository not found (in subrepo sub/repo) (glob)
12753 ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	648	[255]
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	649
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	650	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	651
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	652	$ 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	653	pulling from issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	654	searching for changes
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	655	no changes found
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	656
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	657	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	658
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	659	$ hg init issue1852c
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	660	$ 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	661	pulling from issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	662	adding changesets
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	663	adding manifests
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	664	adding file changes
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	665	added 1 changesets with 2 changes to 2 files
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15410 diff changeset	666	cloning subrepo sub/repo from issue1852a/sub/repo (glob)
12852 5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	667	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	668
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself Mads Kiilerich <mads@kiilerich.com> parents: 12640 diff changeset	669	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	670
12852 5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	671	$ hg -R issue1852a push `pwd`/issue1852c
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	672	pushing to $TESTTMP/issue1852c
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	673	pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo (glob)
12852 5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	674	searching for changes
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	675	no changes found
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	676	searching for changes
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	677	adding changesets
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	678	adding manifests
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	679	adding file changes
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852) Mads Kiilerich <mads@kiilerich.com> parents: 12847 diff changeset	680	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	681
14360 ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	682	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	683
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	684	$ hg clone -q issue1852a issue1852d
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	685	$ hg -R issue1852d outgoing --subrepos issue1852c
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	686	comparing with issue1852c
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	687	searching for changes
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	688	no changes found
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	689	comparing with issue1852c/sub/repo
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	690	searching for changes
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	691	no changes found
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	692	[1]
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	693	$ hg -R issue1852d incoming --subrepos issue1852c
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	694	comparing with issue1852c
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	695	searching for changes
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	696	no changes found
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	697	comparing with issue1852c/sub/repo
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	698	searching for changes
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	699	no changes found
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	700	[1]
ab687820c4cc subrepo: respect non-default path for incoming/outgoing Martin Geisler <mg@aragost.com> parents: 13417 diff changeset	701
13233 0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	702	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	703	subrepository:
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	704
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	705	$ 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	706	$ cd subrepo-status
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	707	$ 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	708	$ 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	709	$ cd subrepo-2
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	710	$ touch file
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	711	$ hg add file
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	712	$ cd ..
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	713	$ 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	714	$ 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	715	$ hg add .hgsub
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 12852 diff changeset	716	$ 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	717	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	718	$ 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	719
17938 fd903f89e42b share: always set default path to work with subrepos (issue3518) simon@laptop-tosh parents: 17907 diff changeset	720	Check that share works with subrepo
fd903f89e42b share: always set default path to work with subrepos (issue3518) simon@laptop-tosh parents: 17907 diff changeset	721	$ hg --config extensions.share= share . ../shared
fd903f89e42b share: always set default path to work with subrepos (issue3518) simon@laptop-tosh parents: 17907 diff changeset	722	updating working directory
fd903f89e42b share: always set default path to work with subrepos (issue3518) simon@laptop-tosh parents: 17907 diff changeset	723	cloning subrepo subrepo-2 from $TESTTMP/subrepo-status/subrepo-2
fd903f89e42b share: always set default path to work with subrepos (issue3518) simon@laptop-tosh parents: 17907 diff changeset	724	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
fd903f89e42b share: always set default path to work with subrepos (issue3518) simon@laptop-tosh parents: 17907 diff changeset	725	$ test -f ../shared/subrepo-1/.hg/sharedpath
fd903f89e42b share: always set default path to work with subrepos (issue3518) simon@laptop-tosh parents: 17907 diff changeset	726	[1]
18510 f254ab6207ae subrepo: use sharepath if available when locating the source repo Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	727	$ hg -R ../shared in
18511 798ab869b2ee share: backout fd903f89e42b, except the test Matt Harbison <matt_harbison@yahoo.com> parents: 18510 diff changeset	728	abort: repository default not found!
798ab869b2ee share: backout fd903f89e42b, except the test Matt Harbison <matt_harbison@yahoo.com> parents: 18510 diff changeset	729	[255]
18510 f254ab6207ae subrepo: use sharepath if available when locating the source repo Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	730	$ hg -R ../shared/subrepo-2 showconfig paths
f254ab6207ae subrepo: use sharepath if available when locating the source repo Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	731	paths.default=$TESTTMP/subrepo-status/subrepo-2
f254ab6207ae subrepo: use sharepath if available when locating the source repo Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	732	$ hg -R ../shared/subrepo-1 sum --remote
f254ab6207ae subrepo: use sharepath if available when locating the source repo Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	733	parent: -1:000000000000 tip (empty repository)
f254ab6207ae subrepo: use sharepath if available when locating the source repo Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	734	branch: default
f254ab6207ae subrepo: use sharepath if available when locating the source repo Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	735	commit: (clean)
f254ab6207ae subrepo: use sharepath if available when locating the source repo Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	736	update: (current)
f254ab6207ae subrepo: use sharepath if available when locating the source repo Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	737	remote: (synced)
17938 fd903f89e42b share: always set default path to work with subrepos (issue3518) simon@laptop-tosh parents: 17907 diff changeset	738
13322 c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	739	Check hg update --clean
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	740	$ cd $TESTTMP/t
13322 c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	741	$ 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	742	$ 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	743	C .hgsub
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	744	C .hgsubstate
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	745	C a
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	746	C s/.hgsub
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	747	C s/.hgsubstate
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	748	C s/a
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	749	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	750	C t/t
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	751	$ 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	752	$ cd s
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	753	$ echo c1 > b
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	754	$ echo c1 > c
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	755	$ hg add b
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	756	$ cd ..
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	757	$ hg status -S
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	758	M s/a
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	759	A s/b
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	760	? s/c
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	761	$ hg update -C
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	762	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	763	$ hg status -S
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	764	? s/b
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos Erik Zielke <ez@aragost.com> parents: 13233 diff changeset	765	? s/c
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	766
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	767	Sticky subrepositories, no changes
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	768	$ cd $TESTTMP/t
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	769	$ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	770	925c17564ef8 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	771	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	772	12a213df6fa9 tip
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 17255 diff changeset	773	$ hg -R t id
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	774	52c0adc0515a tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	775	$ hg update 11
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	776	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	777	$ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	778	365661e5936a
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	779	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	780	fc627a69481f
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 17255 diff changeset	781	$ hg -R t id
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	782	e95bcfa18a35
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	783
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	784	Sticky subrepositorys, file changes
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	785	$ touch s/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	786	$ touch t/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	787	$ hg add -S s/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	788	$ hg add -S t/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	789	$ hg id
17255 3e856d8abe9c identity: show trailing '+' for dirty subrepos (issue2839) Patrick Mezard <patrick@mezard.eu> parents: 16912 diff changeset	790	365661e5936a+
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	791	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	792	fc627a69481f+
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 17255 diff changeset	793	$ hg -R t id
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	794	e95bcfa18a35+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	795	$ hg update tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	796	subrepository sources for s differ
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	797	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	798	l
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	799	subrepository sources for t differ
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	800	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	801	l
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	802	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	803	$ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	804	925c17564ef8+ tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	805	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	806	fc627a69481f+
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 17255 diff changeset	807	$ hg -R t id
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	808	e95bcfa18a35+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	809	$ hg update --clean tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	810	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	811
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	812	Sticky subrepository, revision updates
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	813	$ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	814	925c17564ef8 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	815	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	816	12a213df6fa9 tip
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 17255 diff changeset	817	$ hg -R t id
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	818	52c0adc0515a tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	819	$ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	820	$ hg update -r -2
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	821	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	822	$ cd ../t
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	823	$ hg update -r 2
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	824	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	825	$ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	826	$ hg update 10
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	827	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	828	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	829	l
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	830	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	831	$ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	832	e45c8b14af55+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	833	$ hg -R s id
17255 3e856d8abe9c identity: show trailing '+' for dirty subrepos (issue2839) Patrick Mezard <patrick@mezard.eu> parents: 16912 diff changeset	834	02dcf1d70411
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 17255 diff changeset	835	$ hg -R t id
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	836	7af322bc1198
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	837
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	838	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	839	$ touch s/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	840	$ touch t/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	841	$ hg add -S s/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	842	$ hg add -S t/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	843	$ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	844	e45c8b14af55+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	845	$ hg -R s id
17255 3e856d8abe9c identity: show trailing '+' for dirty subrepos (issue2839) Patrick Mezard <patrick@mezard.eu> parents: 16912 diff changeset	846	02dcf1d70411+
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 17255 diff changeset	847	$ hg -R t id
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	848	7af322bc1198+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	849	$ hg update tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	850	subrepository sources for s differ
17255 3e856d8abe9c identity: show trailing '+' for dirty subrepos (issue2839) Patrick Mezard <patrick@mezard.eu> parents: 16912 diff changeset	851	use (l)ocal source (02dcf1d70411) or (r)emote source (12a213df6fa9)?
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	852	l
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	853	subrepository sources for t differ
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	854	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	855	l
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	856	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	857	$ hg id
17255 3e856d8abe9c identity: show trailing '+' for dirty subrepos (issue2839) Patrick Mezard <patrick@mezard.eu> parents: 16912 diff changeset	858	925c17564ef8+ tip
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	859	$ hg -R s id
17255 3e856d8abe9c identity: show trailing '+' for dirty subrepos (issue2839) Patrick Mezard <patrick@mezard.eu> parents: 16912 diff changeset	860	02dcf1d70411+
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 17255 diff changeset	861	$ hg -R t id
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	862	7af322bc1198+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	863
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	864	Sticky repository, update --clean
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	865	$ hg update --clean tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	866	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	867	$ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	868	925c17564ef8 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	869	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	870	12a213df6fa9 tip
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 17255 diff changeset	871	$ hg -R t id
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	872	52c0adc0515a tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	873
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	874	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	875	$ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	876	$ hg update fc627a69481f
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	877	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	878	$ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	879	$ hg update 11
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	880	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	881	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	882	$ hg id -n
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	883	11+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	884	$ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	885	fc627a69481f
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 17255 diff changeset	886	$ hg -R t id
13417 0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos Erik Zielke <ez@aragost.com> parents: 13411 diff changeset	887	e95bcfa18a35
14536 52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	888
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	889	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	890
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	891	$ 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	892	$ hg ci -mrm
16073 b254f827b7a6 subrepo: rewrite handling of subrepo state at commit (issue2403) Matt Mackall <mpm@selenic.com> parents: 16039 diff changeset	893	nothing changed
b254f827b7a6 subrepo: rewrite handling of subrepo state at commit (issue2403) Matt Mackall <mpm@selenic.com> parents: 16039 diff changeset	894	[1]
14536 52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	895	$ hg log -vr tip
16073 b254f827b7a6 subrepo: rewrite handling of subrepo state at commit (issue2403) Matt Mackall <mpm@selenic.com> parents: 16039 diff changeset	896	changeset: 13:925c17564ef8
14536 52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	897	tag: tip
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	898	user: test
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	899	date: Thu Jan 01 00:00:00 1970 +0000
16073 b254f827b7a6 subrepo: rewrite handling of subrepo state at commit (issue2403) Matt Mackall <mpm@selenic.com> parents: 16039 diff changeset	900	files: .hgsubstate
14536 52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	901	description:
16073 b254f827b7a6 subrepo: rewrite handling of subrepo state at commit (issue2403) Matt Mackall <mpm@selenic.com> parents: 16039 diff changeset	902	13
14536 52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	903
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	904
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	905
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	906	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	907
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	908	$ hg rm .hgsub
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	909	$ hg ci -mrm2
16073 b254f827b7a6 subrepo: rewrite handling of subrepo state at commit (issue2403) Matt Mackall <mpm@selenic.com> parents: 16039 diff changeset	910	created new head
14536 52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	911	$ hg log -vr tip
16073 b254f827b7a6 subrepo: rewrite handling of subrepo state at commit (issue2403) Matt Mackall <mpm@selenic.com> parents: 16039 diff changeset	912	changeset: 14:2400bccd50af
14536 52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	913	tag: tip
16073 b254f827b7a6 subrepo: rewrite handling of subrepo state at commit (issue2403) Matt Mackall <mpm@selenic.com> parents: 16039 diff changeset	914	parent: 11:365661e5936a
14536 52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	915	user: test
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	916	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	917	files: .hgsub .hgsubstate
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	918	description:
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	919	rm2
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	920
52cbeb5a651b subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) Matt Mackall <mpm@selenic.com> parents: 14525 diff changeset	921
15635 82f5e471792d test-subrepo: test for Issue3153 Martin Geisler <mg@lazybytes.net> parents: 15615 diff changeset	922	Test issue3153: diff -S with deleted subrepos
82f5e471792d test-subrepo: test for Issue3153 Martin Geisler <mg@lazybytes.net> parents: 15615 diff changeset	923
82f5e471792d test-subrepo: test for Issue3153 Martin Geisler <mg@lazybytes.net> parents: 15615 diff changeset	924	$ hg diff --nodates -S -c .
16073 b254f827b7a6 subrepo: rewrite handling of subrepo state at commit (issue2403) Matt Mackall <mpm@selenic.com> parents: 16039 diff changeset	925	diff -r 365661e5936a -r 2400bccd50af .hgsub
15635 82f5e471792d test-subrepo: test for Issue3153 Martin Geisler <mg@lazybytes.net> parents: 15615 diff changeset	926	--- a/.hgsub
82f5e471792d test-subrepo: test for Issue3153 Martin Geisler <mg@lazybytes.net> parents: 15615 diff changeset	927	+++ /dev/null
82f5e471792d test-subrepo: test for Issue3153 Martin Geisler <mg@lazybytes.net> parents: 15615 diff changeset	928	@@ -1,2 +0,0 @@
82f5e471792d test-subrepo: test for Issue3153 Martin Geisler <mg@lazybytes.net> parents: 15615 diff changeset	929	-s = s
82f5e471792d test-subrepo: test for Issue3153 Martin Geisler <mg@lazybytes.net> parents: 15615 diff changeset	930	-t = t
16073 b254f827b7a6 subrepo: rewrite handling of subrepo state at commit (issue2403) Matt Mackall <mpm@selenic.com> parents: 16039 diff changeset	931	diff -r 365661e5936a -r 2400bccd50af .hgsubstate
15635 82f5e471792d test-subrepo: test for Issue3153 Martin Geisler <mg@lazybytes.net> parents: 15615 diff changeset	932	--- a/.hgsubstate
82f5e471792d test-subrepo: test for Issue3153 Martin Geisler <mg@lazybytes.net> parents: 15615 diff changeset	933	+++ /dev/null
82f5e471792d test-subrepo: test for Issue3153 Martin Geisler <mg@lazybytes.net> parents: 15615 diff changeset	934	@@ -1,2 +0,0 @@
82f5e471792d test-subrepo: test for Issue3153 Martin Geisler <mg@lazybytes.net> parents: 15615 diff changeset	935	-fc627a69481fcbe5f1135069e8a3881c023e4cf5 s
82f5e471792d test-subrepo: test for Issue3153 Martin Geisler <mg@lazybytes.net> parents: 15615 diff changeset	936	-e95bcfa18a358dc4936da981ebf4147b4cad1362 t
15636 4841035f37b6 merge with stable Martin Geisler <mg@lazybytes.net> parents: 15625 15635 diff changeset	937
15409 83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	938	Test behavior of add for explicit path in subrepo:
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	939	$ cd ..
15473 d90b0b30464b tests: add test for behavior of forget for explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15447 diff changeset	940	$ hg init explicit
d90b0b30464b tests: add test for behavior of forget for explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15447 diff changeset	941	$ cd explicit
15409 83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	942	$ echo s = s > .hgsub
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	943	$ hg add .hgsub
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	944	$ hg init s
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	945	$ hg ci -m0
15410 9e99d2bbb1b1 add: support adding explicit files in subrepos David M. Carr <david@carrclan.us> parents: 15409 diff changeset	946	Adding with an explicit path in a subrepo adds the file
15409 83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	947	$ echo c1 > f1
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	948	$ echo c2 > s/f2
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	949	$ hg st -S
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	950	? f1
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	951	? s/f2
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	952	$ hg add s/f2
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	953	$ hg st -S
15410 9e99d2bbb1b1 add: support adding explicit files in subrepos David M. Carr <david@carrclan.us> parents: 15409 diff changeset	954	A s/f2
15409 83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	955	? f1
15410 9e99d2bbb1b1 add: support adding explicit files in subrepos David M. Carr <david@carrclan.us> parents: 15409 diff changeset	956	$ hg ci -R s -m0
15409 83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	957	$ hg ci -Am1
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	958	adding f1
15410 9e99d2bbb1b1 add: support adding explicit files in subrepos David M. Carr <david@carrclan.us> parents: 15409 diff changeset	959	Adding with an explicit path in a subrepo with -S has the same behavior
15409 83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	960	$ echo c3 > f3
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	961	$ echo c4 > s/f4
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	962	$ hg st -S
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	963	? f3
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	964	? s/f4
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	965	$ hg add -S s/f4
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	966	$ hg st -S
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	967	A s/f4
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	968	? f3
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	969	$ hg ci -R s -m1
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	970	$ hg ci -Ama2
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	971	adding f3
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	972	Adding without a path or pattern silently ignores subrepos
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	973	$ echo c5 > f5
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	974	$ echo c6 > s/f6
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	975	$ echo c7 > s/f7
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	976	$ hg st -S
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	977	? f5
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	978	? s/f6
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	979	? s/f7
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	980	$ hg add
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	981	adding f5
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	982	$ hg st -S
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	983	A f5
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	984	? s/f6
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	985	? s/f7
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	986	$ hg ci -R s -Am2
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	987	adding f6
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	988	adding f7
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	989	$ hg ci -m3
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	990	Adding without a path or pattern with -S also adds files in subrepos
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	991	$ echo c8 > f8
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	992	$ echo c9 > s/f9
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	993	$ echo c10 > s/f10
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	994	$ hg st -S
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	995	? f8
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	996	? s/f10
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	997	? s/f9
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	998	$ hg add -S
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	999	adding f8
15520 d6d7b56ec346 tests: add missing '(glob)'s to match '\' in paths in test output on windows Mads Kiilerich <mads@kiilerich.com> parents: 15474 diff changeset	1000	adding s/f10 (glob)
d6d7b56ec346 tests: add missing '(glob)'s to match '\' in paths in test output on windows Mads Kiilerich <mads@kiilerich.com> parents: 15474 diff changeset	1001	adding s/f9 (glob)
15409 83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1002	$ hg st -S
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1003	A f8
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1004	A s/f10
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1005	A s/f9
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1006	$ hg ci -R s -m3
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1007	$ hg ci -m4
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1008	Adding with a pattern silently ignores subrepos
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1009	$ echo c11 > fm11
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1010	$ echo c12 > fn12
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1011	$ echo c13 > s/fm13
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1012	$ echo c14 > s/fn14
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1013	$ hg st -S
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1014	? fm11
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1015	? fn12
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1016	? s/fm13
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1017	? s/fn14
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1018	$ hg add 'glob:*fm'
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1019	adding fm11
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1020	$ hg st -S
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1021	A fm11
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1022	? fn12
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1023	? s/fm13
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1024	? s/fn14
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1025	$ hg ci -R s -Am4
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1026	adding fm13
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1027	adding fn14
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1028	$ hg ci -Am5
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1029	adding fn12
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1030	Adding with a pattern with -S also adds matches in subrepos
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1031	$ echo c15 > fm15
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1032	$ echo c16 > fn16
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1033	$ echo c17 > s/fm17
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1034	$ echo c18 > s/fn18
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1035	$ hg st -S
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1036	? fm15
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1037	? fn16
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1038	? s/fm17
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1039	? s/fn18
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1040	$ hg add -S 'glob:*fm'
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1041	adding fm15
15520 d6d7b56ec346 tests: add missing '(glob)'s to match '\' in paths in test output on windows Mads Kiilerich <mads@kiilerich.com> parents: 15474 diff changeset	1042	adding s/fm17 (glob)
15409 83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1043	$ hg st -S
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1044	A fm15
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1045	A s/fm17
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1046	? fn16
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1047	? s/fn18
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1048	$ hg ci -R s -Am5
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1049	adding fn18
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1050	$ hg ci -Am6
83c2e6772408 tests: add test for add of explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15321 diff changeset	1051	adding fn16
15473 d90b0b30464b tests: add test for behavior of forget for explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15447 diff changeset	1052
d90b0b30464b tests: add test for behavior of forget for explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15447 diff changeset	1053	Test behavior of forget for explicit path in subrepo:
15474 95174c381525 forget: support forgetting explicit paths in subrepos David M. Carr <david@carrclan.us> parents: 15473 diff changeset	1054	Forgetting an explicit path in a subrepo untracks the file
15473 d90b0b30464b tests: add test for behavior of forget for explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15447 diff changeset	1055	$ echo c19 > s/f19
d90b0b30464b tests: add test for behavior of forget for explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15447 diff changeset	1056	$ hg add s/f19
d90b0b30464b tests: add test for behavior of forget for explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15447 diff changeset	1057	$ hg st -S
d90b0b30464b tests: add test for behavior of forget for explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15447 diff changeset	1058	A s/f19
d90b0b30464b tests: add test for behavior of forget for explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15447 diff changeset	1059	$ hg forget s/f19
15474 95174c381525 forget: support forgetting explicit paths in subrepos David M. Carr <david@carrclan.us> parents: 15473 diff changeset	1060	$ hg st -S
95174c381525 forget: support forgetting explicit paths in subrepos David M. Carr <david@carrclan.us> parents: 15473 diff changeset	1061	? s/f19
15473 d90b0b30464b tests: add test for behavior of forget for explicit path in subrepo David M. Carr <david@carrclan.us> parents: 15447 diff changeset	1062	$ rm s/f19
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	1063	$ cd ..
18520 751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1064
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1065	Courtesy phases synchronisation to publishing server does not block the push
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1066	(issue3781)
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1067
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1068	$ cp -r main issue3781
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1069	$ cp -r main issue3781-dest
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1070	$ cd issue3781-dest/s
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1071	$ hg phase tip # show we have draft changeset
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1072	5: draft
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1073	$ chmod a-w .hg/store/phaseroots # prevent phase push
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1074	$ cd ../../issue3781
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1075	$ cat >> .hg/hgrc << EOF
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1076	> [paths]
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1077	> default=../issue3781-dest/
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1078	> EOF
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1079	$ hg push
18555 b31e0be96c79 tests: fix windows test failure in test-subrepo.t Mads Kiilerich <madski@unity3d.com> parents: 18520 diff changeset	1080	pushing to $TESTTMP/issue3781-dest (glob)
18520 751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1081	pushing subrepo s to $TESTTMP/issue3781-dest/s
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1082	searching for changes
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1083	no changes found
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1084	searching for changes
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1085	no changes found
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1086	[1]
751135cca13c subrepo: allows to drop courtesy phase sync (issue3781) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18511 diff changeset	1087

author	Angel Ezquerra <angel.ezquerra@gmail.com>
	Sat, 16 Feb 2013 01:18:53 +0100
changeset 18939	aab0c14c20d0
parent 18720	0ade08dcb3c3
child 18941	cb5f5859b3fd
permissions	-rw-r--r--