mercurial: tests/test-bookmarks-pushpull.t@4267c840c481 (annotated)

15446 c5c9ca3719f9 tests: use 'hghave serve' to guard tests that requires serve daemon management Mads Kiilerich <mads@kiilerich.com> parents: 14164 diff changeset	1	$ "$TESTDIR/hghave" serve \|\| exit 80
c5c9ca3719f9 tests: use 'hghave serve' to guard tests that requires serve daemon management Mads Kiilerich <mads@kiilerich.com> parents: 14164 diff changeset	2
12303 4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	3	initialize
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	4
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	5	$ hg init a
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	6	$ cd a
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	7	$ echo 'test' > test
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	8	$ hg commit -Am'test'
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	9	adding test
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	10
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	11	set bookmarks
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	12
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	13	$ hg bookmark X
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	14	$ hg bookmark Y
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	15	$ hg bookmark Z
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	16
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	17	import bookmark by name
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	18
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	19	$ hg init ../b
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	20	$ cd ../b
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	21	$ hg book Y
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	22	$ hg book
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	23	* Y -1:000000000000
12303 4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	24	$ hg pull ../a
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	25	pulling from ../a
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	26	requesting all changes
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	27	adding changesets
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	28	adding manifests
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	29	adding file changes
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	30	added 1 changesets with 1 changes to 1 files
13662 80d6e1f63ed9 localrepo: do not update bookmarks in addchangegroup David Soria Parra <dsp@php.net> parents: 13604 diff changeset	31	updating bookmark Y
16697 c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC) Levi Bard <levi@unity3d.com> parents: 16107 diff changeset	32	adding remote bookmark X
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC) Levi Bard <levi@unity3d.com> parents: 16107 diff changeset	33	adding remote bookmark Z
12303 4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	34	(run 'hg update' to get a working copy)
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	35	$ hg bookmarks
16697 c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC) Levi Bard <levi@unity3d.com> parents: 16107 diff changeset	36	X 0:4e3505fd9583
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	37	Y 0:4e3505fd9583
16697 c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC) Levi Bard <levi@unity3d.com> parents: 16107 diff changeset	38	Z 0:4e3505fd9583
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	39	$ hg debugpushkey ../a namespaces
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	40	bookmarks
15648 79cc89de5be1 phases: add basic pushkey support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15614 diff changeset	41	phases
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	42	namespaces
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	43	$ hg debugpushkey ../a bookmarks
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	44	Y 4e3505fd95835d721066b76e75dbb8cc554d7f77
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	45	X 4e3505fd95835d721066b76e75dbb8cc554d7f77
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	46	Z 4e3505fd95835d721066b76e75dbb8cc554d7f77
12303 4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	47	$ hg pull -B X ../a
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	48	pulling from ../a
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	49	no changes found
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	50	importing bookmark X
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	51	$ hg bookmark
13388 a184dbd9b2c5 localrepo: sort hg bookmark output David Soria Parra <dsp@php.net> parents: 13368 diff changeset	52	X 0:4e3505fd9583
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	53	Y 0:4e3505fd9583
16697 c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC) Levi Bard <levi@unity3d.com> parents: 16107 diff changeset	54	Z 0:4e3505fd9583
12303 4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	55
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	56	export bookmark by name
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	57
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	58	$ hg bookmark W
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	59	$ hg bookmark foo
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	60	$ hg bookmark foobar
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	61	$ hg push -B W ../a
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	62	pushing to ../a
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	63	searching for changes
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	64	no changes found
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	65	exporting bookmark W
16038 dad96e752079 push: don't treat bookmark as a found change Matt Mackall <mpm@selenic.com> parents: 16010 diff changeset	66	[1]
12303 4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	67	$ hg -R ../a bookmarks
13388 a184dbd9b2c5 localrepo: sort hg bookmark output David Soria Parra <dsp@php.net> parents: 13368 diff changeset	68	W -1:000000000000
12303 4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	69	X 0:4e3505fd9583
13388 a184dbd9b2c5 localrepo: sort hg bookmark output David Soria Parra <dsp@php.net> parents: 13368 diff changeset	70	Y 0:4e3505fd9583
12303 4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	71	* Z 0:4e3505fd9583
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	72
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	73	delete a remote bookmark
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	74
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	75	$ hg book -d W
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	76	$ hg push -B W ../a
13368 d4ab9486e514 bookmarks: move push/pull command features to core Matt Mackall <mpm@selenic.com> parents: 12969 diff changeset	77	pushing to ../a
d4ab9486e514 bookmarks: move push/pull command features to core Matt Mackall <mpm@selenic.com> parents: 12969 diff changeset	78	searching for changes
d4ab9486e514 bookmarks: move push/pull command features to core Matt Mackall <mpm@selenic.com> parents: 12969 diff changeset	79	no changes found
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	80	deleting remote bookmark W
16038 dad96e752079 push: don't treat bookmark as a found change Matt Mackall <mpm@selenic.com> parents: 16010 diff changeset	81	[1]
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	82
12303 4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	83	push/pull name that doesn't exist
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	84
4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	85	$ hg push -B badname ../a
13368 d4ab9486e514 bookmarks: move push/pull command features to core Matt Mackall <mpm@selenic.com> parents: 12969 diff changeset	86	pushing to ../a
d4ab9486e514 bookmarks: move push/pull command features to core Matt Mackall <mpm@selenic.com> parents: 12969 diff changeset	87	searching for changes
d4ab9486e514 bookmarks: move push/pull command features to core Matt Mackall <mpm@selenic.com> parents: 12969 diff changeset	88	no changes found
12303 4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	89	bookmark badname does not exist on the local or remote repository!
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12303 diff changeset	90	[2]
12303 4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	91	$ hg pull -B anotherbadname ../a
13368 d4ab9486e514 bookmarks: move push/pull command features to core Matt Mackall <mpm@selenic.com> parents: 12969 diff changeset	92	pulling from ../a
12303 4ab87473029d tests: add test for bookmark push/pull Will Maier <willmaier@ml1.net> parents: diff changeset	93	abort: remote bookmark anotherbadname not found!
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12303 diff changeset	94	[255]
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	95
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	96	divergent bookmarks
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	97
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	98	$ cd ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	99	$ echo c1 > f1
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	100	$ hg ci -Am1
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	101	adding f1
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	102	$ hg book -f X
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	103	$ hg book
13388 a184dbd9b2c5 localrepo: sort hg bookmark output David Soria Parra <dsp@php.net> parents: 13368 diff changeset	104	* X 1:0d2164f0ce0d
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	105	Y 0:4e3505fd9583
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	106	Z 1:0d2164f0ce0d
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	107
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	108	$ cd ../b
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	109	$ hg up
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	110	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
16010 c7811ca6fb94 update: note updated bookmark Kevin Bullock <kbullock@ringworld.org> parents: 15935 diff changeset	111	updating bookmark foobar
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	112	$ echo c2 > f2
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	113	$ hg ci -Am2
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	114	adding f2
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	115	$ hg book -f X
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	116	$ hg book
13388 a184dbd9b2c5 localrepo: sort hg bookmark output David Soria Parra <dsp@php.net> parents: 13368 diff changeset	117	* X 1:9b140be10808
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	118	Y 0:4e3505fd9583
16697 c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC) Levi Bard <levi@unity3d.com> parents: 16107 diff changeset	119	Z 0:4e3505fd9583
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	120	foo -1:000000000000
15935 6c97eb445341 bookmarks: automatically advance bookmark on naked update (BC) (issue2894) Matt Mackall <mpm@selenic.com> parents: 15648 diff changeset	121	foobar 1:9b140be10808
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	122
15614 260a6449d83a bookmarks: mark divergent bookmarks with book@pathalias when source in [paths] Matt Mackall <mpm@selenic.com> parents: 15613 diff changeset	123	$ hg pull --config paths.foo=../a foo
260a6449d83a bookmarks: mark divergent bookmarks with book@pathalias when source in [paths] Matt Mackall <mpm@selenic.com> parents: 15613 diff changeset	124	pulling from $TESTTMP/a
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	125	searching for changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	126	adding changesets
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	127	adding manifests
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	128	adding file changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	129	added 1 changesets with 1 changes to 1 files (+1 heads)
15614 260a6449d83a bookmarks: mark divergent bookmarks with book@pathalias when source in [paths] Matt Mackall <mpm@selenic.com> parents: 15613 diff changeset	130	divergent bookmark X stored as X@foo
16697 c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC) Levi Bard <levi@unity3d.com> parents: 16107 diff changeset	131	updating bookmark Z
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	132	(run 'hg heads' to see heads, 'hg merge' to merge)
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	133	$ hg book
13388 a184dbd9b2c5 localrepo: sort hg bookmark output David Soria Parra <dsp@php.net> parents: 13368 diff changeset	134	* X 1:9b140be10808
15614 260a6449d83a bookmarks: mark divergent bookmarks with book@pathalias when source in [paths] Matt Mackall <mpm@selenic.com> parents: 15613 diff changeset	135	X@foo 2:0d2164f0ce0d
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	136	Y 0:4e3505fd9583
16697 c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC) Levi Bard <levi@unity3d.com> parents: 16107 diff changeset	137	Z 2:0d2164f0ce0d
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	138	foo -1:000000000000
15935 6c97eb445341 bookmarks: automatically advance bookmark on naked update (BC) (issue2894) Matt Mackall <mpm@selenic.com> parents: 15648 diff changeset	139	foobar 1:9b140be10808
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	140	$ hg push -f ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	141	pushing to ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	142	searching for changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	143	adding changesets
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	144	adding manifests
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	145	adding file changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	146	added 1 changesets with 1 changes to 1 files (+1 heads)
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	147	$ hg -R ../a book
13388 a184dbd9b2c5 localrepo: sort hg bookmark output David Soria Parra <dsp@php.net> parents: 13368 diff changeset	148	* X 1:0d2164f0ce0d
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	149	Y 0:4e3505fd9583
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	150	Z 1:0d2164f0ce0d
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	151
16835 4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	152	update a remote bookmark from a non-head to a head
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	153
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	154	$ hg up -q Y
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	155	$ echo c3 > f2
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	156	$ hg ci -Am3
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	157	adding f2
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	158	created new head
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	159	$ hg push ../a
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	160	pushing to ../a
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	161	searching for changes
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	162	adding changesets
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	163	adding manifests
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	164	adding file changes
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	165	added 1 changesets with 1 changes to 1 files (+1 heads)
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	166	updating bookmark Y
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	167	$ hg -R ../a book
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	168	* X 1:0d2164f0ce0d
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	169	Y 3:f6fc62dde3c0
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	170	Z 1:0d2164f0ce0d
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	171
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	172	diverging a remote bookmark fails
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	173
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	174	$ hg up -q 4e3505fd9583
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	175	$ echo c4 > f2
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	176	$ hg ci -Am4
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	177	adding f2
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	178	created new head
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	179	$ hg book -f Y
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	180	$ hg push ../a
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	181	pushing to ../a
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	182	searching for changes
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	183	abort: push creates new remote head 4efff6d98829!
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	184	(did you forget to merge? use push -f to force)
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	185	[255]
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	186	$ hg -R ../a book
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	187	* X 1:0d2164f0ce0d
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	188	Y 3:f6fc62dde3c0
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	189	Z 1:0d2164f0ce0d
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	190
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	191	hgweb
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	192
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	193	$ cat <<EOF > .hg/hgrc
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	194	> [web]
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	195	> push_ssl = false
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	196	> allow_push = *
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	197	> EOF
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	198
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	199	$ hg serve -p $HGPORT -d --pid-file=../hg.pid -E errors.log
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	200	$ cat ../hg.pid >> $DAEMON_PIDS
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	201	$ cd ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	202
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	203	$ hg debugpushkey http://localhost:$HGPORT/ namespaces
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	204	bookmarks
15648 79cc89de5be1 phases: add basic pushkey support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15614 diff changeset	205	phases
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	206	namespaces
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	207	$ hg debugpushkey http://localhost:$HGPORT/ bookmarks
16835 4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	208	Y 4efff6d98829d9c824c621afd6e3f01865f5439f
16697 c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC) Levi Bard <levi@unity3d.com> parents: 16107 diff changeset	209	foobar 9b140be1080824d768c5a4691a564088eede71f9
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC) Levi Bard <levi@unity3d.com> parents: 16107 diff changeset	210	Z 0d2164f0ce0d8f1d6f94351eba04b794909be66c
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	211	foo 0000000000000000000000000000000000000000
16697 c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC) Levi Bard <levi@unity3d.com> parents: 16107 diff changeset	212	X 9b140be1080824d768c5a4691a564088eede71f9
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	213	$ hg out -B http://localhost:$HGPORT/
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	214	comparing with http://localhost:$HGPORT/
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	215	searching for changed bookmarks
16697 c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC) Levi Bard <levi@unity3d.com> parents: 16107 diff changeset	216	no changed bookmarks found
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC) Levi Bard <levi@unity3d.com> parents: 16107 diff changeset	217	[1]
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	218	$ hg push -B Z http://localhost:$HGPORT/
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	219	pushing to http://localhost:$HGPORT/
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	220	searching for changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	221	no changes found
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	222	exporting bookmark Z
16038 dad96e752079 push: don't treat bookmark as a found change Matt Mackall <mpm@selenic.com> parents: 16010 diff changeset	223	[1]
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	224	$ hg book -d Z
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	225	$ hg in -B http://localhost:$HGPORT/
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	226	comparing with http://localhost:$HGPORT/
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	227	searching for changed bookmarks
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	228	Z 0d2164f0ce0d
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	229	foo 000000000000
15935 6c97eb445341 bookmarks: automatically advance bookmark on naked update (BC) (issue2894) Matt Mackall <mpm@selenic.com> parents: 15648 diff changeset	230	foobar 9b140be10808
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	231	$ hg pull -B Z http://localhost:$HGPORT/
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	232	pulling from http://localhost:$HGPORT/
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	233	no changes found
16697 c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC) Levi Bard <levi@unity3d.com> parents: 16107 diff changeset	234	adding remote bookmark foobar
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC) Levi Bard <levi@unity3d.com> parents: 16107 diff changeset	235	adding remote bookmark Z
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC) Levi Bard <levi@unity3d.com> parents: 16107 diff changeset	236	adding remote bookmark foo
15613 2fad18f15409 bookmarks: shadow divergent bookmarks of foo with foo@n Matt Mackall <mpm@selenic.com> parents: 15446 diff changeset	237	divergent bookmark X stored as X@1
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	238	importing bookmark Z
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13469 diff changeset	239	$ hg clone http://localhost:$HGPORT/ cloned-bookmarks
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13469 diff changeset	240	requesting all changes
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13469 diff changeset	241	adding changesets
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13469 diff changeset	242	adding manifests
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13469 diff changeset	243	adding file changes
16835 4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	244	added 5 changesets with 5 changes to 3 files (+3 heads)
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13469 diff changeset	245	updating to branch default
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13469 diff changeset	246	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13469 diff changeset	247	$ hg -R cloned-bookmarks bookmarks
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13469 diff changeset	248	X 1:9b140be10808
16835 4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing Levi Bard <levi@unity3d.com> parents: 16697 diff changeset	249	Y 4:4efff6d98829
13604 3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13469 diff changeset	250	Z 2:0d2164f0ce0d
3f6a4579f803 hg: add support for cloning bookmarks David Soria Parra <dsp@php.net> parents: 13469 diff changeset	251	foo -1:000000000000
15935 6c97eb445341 bookmarks: automatically advance bookmark on naked update (BC) (issue2894) Matt Mackall <mpm@selenic.com> parents: 15648 diff changeset	252	foobar 1:9b140be10808
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	253
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12346 diff changeset	254	$ kill `cat ../hg.pid`

author	Levi Bard <levi@unity3d.com>
	Sun, 13 May 2012 10:21:27 +0200
changeset 16835	4267c840c481
parent 16697	c285aae10f6c
child 16913	f2719b387380
permissions	-rw-r--r--