hg-stable: tests/test-push-warn.out@08cd25ef8a38 (annotated)

9611 a3d73b3e1f8a hg.clone: report branch name on update Adrian Buehlmann <adrian@cadifra.com> parents: 9609 diff changeset	1	updating to branch default
2175 b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2109 diff changeset	2	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: diff changeset	3	pushing to ../a
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: diff changeset	4	searching for changes
10396 65a90c8e11ee prepush: add more precise error messages Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	5	abort: push creates new remote heads on branch 'default'!
65a90c8e11ee prepush: add more precise error messages Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	6	(you should pull and merge or use push -f to force)
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: diff changeset	7	pulling from ../a
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: diff changeset	8	searching for changes
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: diff changeset	9	adding changesets
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: diff changeset	10	adding manifests
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: diff changeset	11	adding file changes
1043 9344f5dd4488 Update tests mpm@selenic.com parents: 990 diff changeset	12	added 1 changesets with 1 changes to 1 files (+1 heads)
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1043 diff changeset	13	(run 'hg heads' to see heads, 'hg merge' to merge)
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: diff changeset	14	pushing to ../a
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: diff changeset	15	searching for changes
10396 65a90c8e11ee prepush: add more precise error messages Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	16	abort: push creates new remote heads on branch 'default'!
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: diff changeset	17	(did you forget to merge? use push -f to force)
2175 b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2109 diff changeset	18	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2109 diff changeset	19	(branch merge, don't forget to commit)
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: diff changeset	20	pushing to ../a
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: diff changeset	21	searching for changes
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: diff changeset	22	adding changesets
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: diff changeset	23	adding manifests
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: diff changeset	24	adding file changes
7460 3342e6ada4b9 push: use the fast changegroup() path on push Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7233 diff changeset	25	added 2 changesets with 1 changes to 1 files
2021 fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2019 diff changeset	26	adding foo
9611 a3d73b3e1f8a hg.clone: report branch name on update Adrian Buehlmann <adrian@cadifra.com> parents: 9609 diff changeset	27	updating to branch default
2175 b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2109 diff changeset	28	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2109 diff changeset	29	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6181 diff changeset	30	created new head
2175 b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2109 diff changeset	31	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6181 diff changeset	32	created new head
2021 fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2019 diff changeset	33	merging foo
2175 b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2109 diff changeset	34	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2109 diff changeset	35	(branch merge, don't forget to commit)
2021 fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2019 diff changeset	36	pushing to ../c
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2019 diff changeset	37	searching for changes
10396 65a90c8e11ee prepush: add more precise error messages Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	38	abort: push creates new remote heads on branch 'default'!
2021 fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2019 diff changeset	39	(did you forget to merge? use push -f to force)
6098 65340b8231eb push: exit(1) if "push creates new remote branches!" Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	40	1
2021 fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2019 diff changeset	41	pushing to ../c
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2019 diff changeset	42	searching for changes
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2019 diff changeset	43	no changes found
3803 2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3684 diff changeset	44	0
2021 fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2019 diff changeset	45	pushing to ../c
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2019 diff changeset	46	searching for changes
10396 65a90c8e11ee prepush: add more precise error messages Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	47	abort: push creates new remote heads on branch 'default'!
10908 816bac2f9452 prepush: fix bug in warning message selection Sune Foldager <cryo@cyanite.org> parents: 10875 diff changeset	48	(did you forget to merge? use push -f to force)
6098 65340b8231eb push: exit(1) if "push creates new remote branches!" Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	49	1
3803 2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3684 diff changeset	50	pushing to ../c
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3684 diff changeset	51	searching for changes
10396 65a90c8e11ee prepush: add more precise error messages Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	52	abort: push creates new remote heads on branch 'default'!
3803 2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3684 diff changeset	53	(did you forget to merge? use push -f to force)
6098 65340b8231eb push: exit(1) if "push creates new remote branches!" Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	54	1
3684 975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 2424 diff changeset	55	pushing to ../c
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 2424 diff changeset	56	searching for changes
2109 1b183976e007 Revert push new heads logic Matt Mackall <mpm@selenic.com> parents: 2021 diff changeset	57	adding changesets
1b183976e007 Revert push new heads logic Matt Mackall <mpm@selenic.com> parents: 2021 diff changeset	58	adding manifests
1b183976e007 Revert push new heads logic Matt Mackall <mpm@selenic.com> parents: 2021 diff changeset	59	adding file changes
1b183976e007 Revert push new heads logic Matt Mackall <mpm@selenic.com> parents: 2021 diff changeset	60	added 2 changesets with 2 changes to 1 files (+2 heads)
3803 2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3684 diff changeset	61	0
2021 fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2019 diff changeset	62	pushing to ../c
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2019 diff changeset	63	searching for changes
2109 1b183976e007 Revert push new heads logic Matt Mackall <mpm@selenic.com> parents: 2021 diff changeset	64	adding changesets
1b183976e007 Revert push new heads logic Matt Mackall <mpm@selenic.com> parents: 2021 diff changeset	65	adding manifests
1b183976e007 Revert push new heads logic Matt Mackall <mpm@selenic.com> parents: 2021 diff changeset	66	adding file changes
2424 092039246d73 Report on push/pull if heads are merged, too, like for new heads. Thomas Arendsen Hein <thomas@intevation.de> parents: 2175 diff changeset	67	added 1 changesets with 1 changes to 1 files (-1 heads)
3803 2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3684 diff changeset	68	0
10908 816bac2f9452 prepush: fix bug in warning message selection Sune Foldager <cryo@cyanite.org> parents: 10875 diff changeset	69	comparing with ../c
816bac2f9452 prepush: fix bug in warning message selection Sune Foldager <cryo@cyanite.org> parents: 10875 diff changeset	70	searching for changes
816bac2f9452 prepush: fix bug in warning message selection Sune Foldager <cryo@cyanite.org> parents: 10875 diff changeset	71	no changes found
816bac2f9452 prepush: fix bug in warning message selection Sune Foldager <cryo@cyanite.org> parents: 10875 diff changeset	72	% issue 450
3923 27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	73	pushing to ../e
27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	74	searching for changes
27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	75	adding changesets
27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	76	adding manifests
27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	77	adding file changes
27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	78	added 1 changesets with 1 changes to 1 files
27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	79	0
27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	80	pushing to ../e
27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	81	searching for changes
27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	82	adding changesets
27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	83	adding manifests
27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	84	adding file changes
27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	85	added 1 changesets with 1 changes to 1 files
27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	86	0
8565 268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	87	% issue 736
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	88	% push on existing branch and new branch
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	89	pushing to ../f
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	90	searching for changes
10371 eacfff116e17 strip apostrophes from an error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10354 diff changeset	91	abort: push creates new remote branches: c!
11211 e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	92	(use 'hg push --new-branch' to create new remote branches)
10354 844d83da2da9 prepush: warn about every new outgoing named branch, not just the first Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9954 diff changeset	93	1
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9954 diff changeset	94	pushing to ../f
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9954 diff changeset	95	searching for changes
10371 eacfff116e17 strip apostrophes from an error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10354 diff changeset	96	abort: push creates new remote branches: c!
11211 e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	97	(use 'hg push --new-branch' to create new remote branches)
10354 844d83da2da9 prepush: warn about every new outgoing named branch, not just the first Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9954 diff changeset	98	1
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9954 diff changeset	99	% multiple new branches
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9954 diff changeset	100	pushing to ../f
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9954 diff changeset	101	searching for changes
10371 eacfff116e17 strip apostrophes from an error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10354 diff changeset	102	abort: push creates new remote branches: c, d!
11211 e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	103	(use 'hg push --new-branch' to create new remote branches)
10354 844d83da2da9 prepush: warn about every new outgoing named branch, not just the first Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9954 diff changeset	104	1
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9954 diff changeset	105	pushing to ../f
844d83da2da9 prepush: warn about every new outgoing named branch, not just the first Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9954 diff changeset	106	searching for changes
10771 01f097c4ae66 push: fix bug in prepush logic and its tests Sune Foldager <cryo@cyanite.org> parents: 10396 diff changeset	107	abort: push creates new remote branches: c, d!
11211 e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	108	(use 'hg push --new-branch' to create new remote branches)
8565 268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	109	1
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	110	% fail on multiple head push
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	111	pushing to ../f
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	112	searching for changes
10396 65a90c8e11ee prepush: add more precise error messages Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	113	abort: push creates new remote heads on branch 'a'!
10908 816bac2f9452 prepush: fix bug in warning message selection Sune Foldager <cryo@cyanite.org> parents: 10875 diff changeset	114	(did you forget to merge? use push -f to force)
8565 268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	115	1
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	116	% push replacement head on existing branches
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	117	pushing to ../f
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	118	searching for changes
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	119	adding changesets
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	120	adding manifests
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	121	adding file changes
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	122	added 2 changesets with 2 changes to 1 files
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	123	0
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	124	% merge of branch a to other branch b followed by unrelated push on branch a
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	125	pushing to ../f
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	126	searching for changes
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	127	adding changesets
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	128	adding manifests
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	129	adding file changes
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	130	added 1 changesets with 1 changes to 1 files (-1 heads)
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	131	0
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	132	pushing to ../f
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	133	searching for changes
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	134	adding changesets
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	135	adding manifests
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	136	adding file changes
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	137	added 1 changesets with 1 changes to 1 files (+1 heads)
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	138	0
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	139	% cheating the counting algorithm
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	140	pushing to ../f
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	141	searching for changes
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	142	adding changesets
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	143	adding manifests
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	144	adding file changes
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	145	added 2 changesets with 2 changes to 1 files
268d16b2ec25 tests: add tests for new pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 7460 diff changeset	146	0
11211 e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	147	% failed push of new named branch
e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	148	pushing to ../f
e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	149	searching for changes
e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	150	abort: push creates new remote branches: e!
e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	151	(use 'hg push --new-branch' to create new remote branches)
e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	152	1
e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	153	% using --new-branch to push new named branch
e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	154	pushing to ../f
e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	155	searching for changes
e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	156	adding changesets
e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	157	adding manifests
e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	158	adding file changes
e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	159	added 1 changesets with 1 changes to 1 files
e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	160	0
9479 f3569d95c2ab push: fix subtle bug in prepush logic Sune Foldager <cryo@cyanite.org> parents: 8565 diff changeset	161	% checking prepush logic does not allow silently pushing multiple new heads
f3569d95c2ab push: fix subtle bug in prepush logic Sune Foldager <cryo@cyanite.org> parents: 8565 diff changeset	162	adding init
f3569d95c2ab push: fix subtle bug in prepush logic Sune Foldager <cryo@cyanite.org> parents: 8565 diff changeset	163	adding a
9611 a3d73b3e1f8a hg.clone: report branch name on update Adrian Buehlmann <adrian@cadifra.com> parents: 9609 diff changeset	164	updating to branch default
9609 aa404f3f661b tests: fix inadvertent use of existing test repository Henrik Stuart <hg@hstuart.dk> parents: 9479 diff changeset	165	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
aa404f3f661b tests: fix inadvertent use of existing test repository Henrik Stuart <hg@hstuart.dk> parents: 9479 diff changeset	166	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
9479 f3569d95c2ab push: fix subtle bug in prepush logic Sune Foldager <cryo@cyanite.org> parents: 8565 diff changeset	167	adding b
f3569d95c2ab push: fix subtle bug in prepush logic Sune Foldager <cryo@cyanite.org> parents: 8565 diff changeset	168	created new head
9609 aa404f3f661b tests: fix inadvertent use of existing test repository Henrik Stuart <hg@hstuart.dk> parents: 9479 diff changeset	169	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
9479 f3569d95c2ab push: fix subtle bug in prepush logic Sune Foldager <cryo@cyanite.org> parents: 8565 diff changeset	170	adding c
f3569d95c2ab push: fix subtle bug in prepush logic Sune Foldager <cryo@cyanite.org> parents: 8565 diff changeset	171	created new head
9609 aa404f3f661b tests: fix inadvertent use of existing test repository Henrik Stuart <hg@hstuart.dk> parents: 9479 diff changeset	172	pushing to h
9479 f3569d95c2ab push: fix subtle bug in prepush logic Sune Foldager <cryo@cyanite.org> parents: 8565 diff changeset	173	searching for changes
10396 65a90c8e11ee prepush: add more precise error messages Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	174	abort: push creates new remote heads on branch 'default'!
65a90c8e11ee prepush: add more precise error messages Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	175	(you should pull and merge or use push -f to force)
9479 f3569d95c2ab push: fix subtle bug in prepush logic Sune Foldager <cryo@cyanite.org> parents: 8565 diff changeset	176
9954 d6a307719ccb fix bug in prepush logic involving merge changesets Sune Foldager <cryo@cyanite.org> parents: 9611 diff changeset	177	% check prepush logic with merged branches
d6a307719ccb fix bug in prepush logic involving merge changesets Sune Foldager <cryo@cyanite.org> parents: 9611 diff changeset	178	marked working directory as branch a
d6a307719ccb fix bug in prepush logic involving merge changesets Sune Foldager <cryo@cyanite.org> parents: 9611 diff changeset	179	adding foo
d6a307719ccb fix bug in prepush logic involving merge changesets Sune Foldager <cryo@cyanite.org> parents: 9611 diff changeset	180	updating to branch a
d6a307719ccb fix bug in prepush logic involving merge changesets Sune Foldager <cryo@cyanite.org> parents: 9611 diff changeset	181	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d6a307719ccb fix bug in prepush logic involving merge changesets Sune Foldager <cryo@cyanite.org> parents: 9611 diff changeset	182	marked working directory as branch b
d6a307719ccb fix bug in prepush logic involving merge changesets Sune Foldager <cryo@cyanite.org> parents: 9611 diff changeset	183	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d6a307719ccb fix bug in prepush logic involving merge changesets Sune Foldager <cryo@cyanite.org> parents: 9611 diff changeset	184	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d6a307719ccb fix bug in prepush logic involving merge changesets Sune Foldager <cryo@cyanite.org> parents: 9611 diff changeset	185	(branch merge, don't forget to commit)
d6a307719ccb fix bug in prepush logic involving merge changesets Sune Foldager <cryo@cyanite.org> parents: 9611 diff changeset	186	pushing to j
d6a307719ccb fix bug in prepush logic involving merge changesets Sune Foldager <cryo@cyanite.org> parents: 9611 diff changeset	187	searching for changes
10771 01f097c4ae66 push: fix bug in prepush logic and its tests Sune Foldager <cryo@cyanite.org> parents: 10396 diff changeset	188	abort: push creates new remote branches: b!
11211 e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11181 diff changeset	189	(use 'hg push --new-branch' to create new remote branches)
10771 01f097c4ae66 push: fix bug in prepush logic and its tests Sune Foldager <cryo@cyanite.org> parents: 10396 diff changeset	190
01f097c4ae66 push: fix bug in prepush logic and its tests Sune Foldager <cryo@cyanite.org> parents: 10396 diff changeset	191	% prepush -r should not allow you to sneak in new heads
01f097c4ae66 push: fix bug in prepush logic and its tests Sune Foldager <cryo@cyanite.org> parents: 10396 diff changeset	192	pushing to ../l
01f097c4ae66 push: fix bug in prepush logic and its tests Sune Foldager <cryo@cyanite.org> parents: 10396 diff changeset	193	searching for changes
10396 65a90c8e11ee prepush: add more precise error messages Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	194	abort: push creates new remote heads on branch 'a'!
10771 01f097c4ae66 push: fix bug in prepush logic and its tests Sune Foldager <cryo@cyanite.org> parents: 10396 diff changeset	195	(did you forget to merge? use push -f to force)
10875 a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	196	% check prepush with new branch head on former topo non-head
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	197	marked working directory as branch A
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	198	adding a
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	199	marked working directory as branch B
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	200	adding b
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	201	updating to branch B
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	202	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	203	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	204	adding b1
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	205	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	206	adding a2
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	207	%% glog of local
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	208	@ 2: A a2
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	209	\|
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	210	\| o 1: B b
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	211	\|/
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	212	o 0: A a
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	213
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	214	%% glog of remote
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	215	@ 2: B b1
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	216	\|
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	217	o 1: B b
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	218	\|
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	219	o 0: A a
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	220
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	221	%% outgoing
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	222	comparing with inner
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	223	searching for changes
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	224	2: A a2
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	225	pushing to inner
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	226	searching for changes
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	227	adding changesets
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	228	adding manifests
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	229	adding file changes
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	230	added 1 changesets with 1 changes to 1 files (+1 heads)
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	231	% check prepush with new branch head on former topo head
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	232	marked working directory as branch A
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	233	adding a
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	234	marked working directory as branch B
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	235	adding b
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	236	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	237	adding a1
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	238	updating to branch A
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	239	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	240	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	241	adding b1
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	242	adding a2
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	243	%% glog of local
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	244	@ 3: A a2
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	245	\|
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	246	o 2: A a1
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	247	\|
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	248	\| o 1: B b
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	249	\|/
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	250	o 0: A a
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	251
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	252	%% glog of remote
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	253	@ 3: B b1
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	254	\|
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	255	\| o 2: A a1
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	256	\| \|
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	257	o \| 1: B b
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	258	\|/
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	259	o 0: A a
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	260
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	261	%% outgoing
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	262	comparing with inner
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	263	searching for changes
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	264	3: A a2
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	265	pushing to inner
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	266	searching for changes
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	267	adding changesets
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	268	adding manifests
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	269	adding file changes
a9702c47a19f partial backout of 1e819576e926 and add tests (issue2131) Sune Foldager <cryo@cyanite.org> parents: 10771 diff changeset	270	added 1 changesets with 1 changes to 1 files
10909 29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	271	% check prepush with new branch head and new child of former branch head
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	272	% but child is on different branch
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	273	marked working directory as branch A
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	274	adding a
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	275	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	276	marked working directory as branch B
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	277	adding b
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	278	updating to branch B
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	279	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	280	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	281	marked working directory as branch B
11317 b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11211 diff changeset	282	created new head
10909 29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	283	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	284	marked working directory as branch A
11317 b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11211 diff changeset	285	created new head
10909 29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	286	%% glog of local
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	287	@ 5: A b3
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	288	\|
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	289	\| o 4: B a3
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	290	\| \|
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	291	o \| 3: B b1
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	292	\| \|
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	293	o \| 2: B b0
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	294	/
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	295	o 1: A a1
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	296	\|
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	297	o 0: A a0
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	298
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	299	%% glog of remote
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	300	@ 3: B b1
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	301	\|
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	302	o 2: B b0
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	303
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	304	o 1: A a1
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	305	\|
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	306	o 0: A a0
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	307
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	308	%% outgoing
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	309	comparing with inner
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	310	searching for changes
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	311	4: B a3
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	312	5: A b3
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	313	pushing to inner
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	314	searching for changes
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	315	abort: push creates new remote heads on branch 'A'!
29a83fb8c067 prepush: add more test cases Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10908 diff changeset	316	(did you forget to merge? use push -f to force)
10925 a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10909 diff changeset	317	pushing to inner
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10909 diff changeset	318	searching for changes
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10909 diff changeset	319	abort: push creates new remote heads on branch 'A'!
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10909 diff changeset	320	(did you forget to merge? use push -f to force)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10909 diff changeset	321	comparing with inner
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10909 diff changeset	322	searching for changes
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10909 diff changeset	323	no changes found

author	Martin Geisler <mg@lazybytes.net>
	Sun, 15 Aug 2010 17:49:59 +0200
branch	stable
changeset 11885	08cd25ef8a38
parent 11317	b66e414d38b0
child 11574	6381fa7bfa53
permissions	-rw-r--r--