upstream/mercurial-mirror Files · tests/test-mv-cp-st-diff.out

fix traceback in hgweb when URL doesn't end in one of the archive specs...

fix traceback in hgweb when URL doesn't end in one of the archive specs If the last n charecters of the URL doesn't match an entry in archive_specs req.form never has a key 'type'. When achive() looks up 'type' in the form dict it causes a traceback rather than printing an error message.

Matt Mackall - - Load All Authors

File last commit:

r6425:2d9328a2 default


                r6669:782dbbdf

default

Download file

             test-mv-cp-st-diff.out
        
                    1220 lines
            
             | 11.6 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-mv-cp-st-diff.out

History | Source | Raw |Copy content |Copy permalink

Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Matt Mackall copies: add tests for status -C/diff --git...	r6278	rename in working dir
		** add a a1 / add a a2 / hg mv a b
		- working to parent:
		A b
		a
		R a

		diff --git a/a b/b
		rename from a
		rename to b

		- working to root: --rev 0
		A b
		a
		R a

		diff --git a/a b/b
		rename from a
		rename to b
		--- a/a
		+++ b/b
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,1 +1,4 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+0
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+a1
		+a2

		- working to branch: --rev 2
		A b
		a
		R a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	R x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		diff --git a/a b/b
		rename from a
		rename to b
		--- a/a
		+++ b/b
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,4 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+0
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+a1
		+a2
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		deleted file mode 100644
		--- a/x/y
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- root to parent: --rev 0 --rev .
		M a

		diff --git a/a b/a
		--- a/a
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,1 +1,4 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+0
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+a1
		+a2

		- parent to root: --rev . --rev 0
		M a

		diff --git a/a b/a
		--- a/a
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,4 +1,1 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	-0
Matt Mackall copies: add tests for status -C/diff --git...	r6278	-a1
		-a2

		- branch to parent: --rev 2 --rev .
		M a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	R x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		diff --git a/a b/a
		--- a/a
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,4 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+0
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+a1
		+a2
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		deleted file mode 100644
		--- a/x/y
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- parent to branch: --rev . --rev 2
		M a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	A x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		diff --git a/a b/a
		--- a/a
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,4 +1,3 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	-0
Matt Mackall copies: add tests for status -C/diff --git...	r6278	-a1
		-a2
		+m1
		+m2
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		new file mode 100644
		--- /dev/null
		+++ b/x/y
		@@ -0,0 +1,1 @@
		+y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278

Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Matt Mackall copies: add tests for status -C/diff --git...	r6278	copy in working dir
		** add a a1 / add a a2 / hg cp a b
		- working to parent:
		A b
		a

		diff --git a/a b/b
		copy from a
		copy to b

		- working to root: --rev 0
		M a
		A b
		a

		diff --git a/a b/a
		--- a/a
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,1 +1,4 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+1
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+a1
		+a2
		diff --git a/a b/b
		copy from a
		copy to b
		--- a/a
		+++ b/b
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,1 +1,4 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+1
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+a1
		+a2

		- working to branch: --rev 2
		M a
		A b
		a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	R x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		diff --git a/a b/a
		--- a/a
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,4 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+1
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+a1
		+a2
		diff --git a/a b/b
		copy from a
		copy to b
		--- a/a
		+++ b/b
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,4 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+1
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+a1
		+a2
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		deleted file mode 100644
		--- a/x/y
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- root to parent: --rev 0 --rev .
		M a

		diff --git a/a b/a
		--- a/a
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,1 +1,4 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+1
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+a1
		+a2

		- parent to root: --rev . --rev 0
		M a

		diff --git a/a b/a
		--- a/a
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,4 +1,1 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	-1
Matt Mackall copies: add tests for status -C/diff --git...	r6278	-a1
		-a2

		- branch to parent: --rev 2 --rev .
		M a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	R x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		diff --git a/a b/a
		--- a/a
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,4 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+1
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+a1
		+a2
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		deleted file mode 100644
		--- a/x/y
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- parent to branch: --rev . --rev 2
		M a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	A x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		diff --git a/a b/a
		--- a/a
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,4 +1,3 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	-1
Matt Mackall copies: add tests for status -C/diff --git...	r6278	-a1
		-a2
		+m1
		+m2
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		new file mode 100644
		--- /dev/null
		+++ b/x/y
		@@ -0,0 +1,1 @@
		+y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278

Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Matt Mackall copies: add tests for status -C/diff --git...	r6278	single rename
		** hg mv a b / add b b1 / add b w
		- working to parent:
		M b

		diff --git a/b b/b
		--- a/b
		+++ b/b
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,4 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	2
Matt Mackall copies: add tests for status -C/diff --git...	r6278	b1
		+w

		- working to root: --rev 0
		A b
		a
		R a

		diff --git a/a b/b
		rename from a
		rename to b
		--- a/a
		+++ b/b
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,1 +1,4 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+2
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+b1
		+w

		- working to branch: --rev 2
		A b
		a
		R a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	R x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		diff --git a/a b/b
		rename from a
		rename to b
		--- a/a
		+++ b/b
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,4 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+2
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+b1
		+w
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		deleted file mode 100644
		--- a/x/y
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- root to parent: --rev 0 --rev .
		A b
		a
		R a

		diff --git a/a b/b
		rename from a
		rename to b
		--- a/a
		+++ b/b
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,1 +1,3 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+2
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+b1

		- parent to root: --rev . --rev 0
		A a
		b
		R b

		diff --git a/b b/a
		rename from b
		rename to a
		--- a/b
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,1 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	-2
Matt Mackall copies: add tests for status -C/diff --git...	r6278	-b1

		- branch to parent: --rev 2 --rev .
		A b
		a
		R a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	R x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		diff --git a/a b/b
		rename from a
		rename to b
		--- a/a
		+++ b/b
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,3 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+2
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+b1
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		deleted file mode 100644
		--- a/x/y
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- parent to branch: --rev . --rev 2
		A a
		b
Matt Mackall copies: skip directory rename checks when not merging...	r6425	A x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278	R b

		diff --git a/b b/a
		rename from b
		rename to a
		--- a/b
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,3 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	-2
Matt Mackall copies: add tests for status -C/diff --git...	r6278	-b1
		+m1
		+m2
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		new file mode 100644
		--- /dev/null
		+++ b/x/y
		@@ -0,0 +1,1 @@
		+y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278

Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Matt Mackall copies: add tests for status -C/diff --git...	r6278	single copy
		** hg cp a b / add b b1 / add a w
		- working to parent:
		M a

		diff --git a/a b/a
		--- a/a
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,2 +1,3 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	3
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+w

		- working to root: --rev 0
		M a
		A b
		a

		diff --git a/a b/a
		--- a/a
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,1 +1,3 @@
		a
		+3
		+w
		diff --git a/a b/b
		copy from a
		copy to b
		--- a/a
		+++ b/b
		@@ -1,1 +1,3 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+3
		+b1

		- working to branch: --rev 2
		M a
		A b
		a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	R x/y
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282
		diff --git a/a b/a
		--- a/a
		+++ b/a
		@@ -1,3 +1,3 @@
		a
		-m1
		-m2
		+3
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+w
		diff --git a/a b/b
		copy from a
		copy to b
		--- a/a
		+++ b/b
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,3 @@
		a
		-m1
		-m2
		+3
		+b1
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		deleted file mode 100644
		--- a/x/y
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-y1
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282
		- root to parent: --rev 0 --rev .
		M a
		A b
		a

		diff --git a/a b/a
		--- a/a
		+++ b/a
Matt Mackall copies: add tests for status -C/diff --git...	r6278	@@ -1,1 +1,2 @@
		a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+3
		diff --git a/a b/b
		copy from a
		copy to b
		--- a/a
		+++ b/b
		@@ -1,1 +1,3 @@
		a
		+3
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+b1

Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	- parent to root: --rev . --rev 0
		M a
		R b

		diff --git a/a b/a
		--- a/a
		+++ b/a
		@@ -1,2 +1,1 @@
		a
		-3
		diff --git a/b b/b
		deleted file mode 100644
		--- a/b
		+++ /dev/null
		@@ -1,3 +0,0 @@
		-a
		-3
		-b1

		- branch to parent: --rev 2 --rev .
Matt Mackall copies: add tests for status -C/diff --git...	r6278	M a
		A b
		a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	R x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		diff --git a/a b/a
		--- a/a
		+++ b/a
		@@ -1,3 +1,2 @@
		a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+3
Matt Mackall copies: add tests for status -C/diff --git...	r6278	diff --git a/a b/b
		copy from a
		copy to b
		--- a/a
		+++ b/b
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,3 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+3
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+b1
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		deleted file mode 100644
		--- a/x/y
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- parent to branch: --rev . --rev 2
		M a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	A x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278	R b

		diff --git a/a b/a
		--- a/a
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,2 +1,3 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	-3
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+m1
		+m2
		diff --git a/b b/b
		deleted file mode 100644
		--- a/b
		+++ /dev/null
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +0,0 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	-a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	-3
Matt Mackall copies: add tests for status -C/diff --git...	r6278	-b1
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		new file mode 100644
		--- /dev/null
		+++ b/x/y
		@@ -0,0 +1,1 @@
		+y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278

Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Matt Mackall copies: add tests for status -C/diff --git...	r6278	rename chain
		** hg mv a b / hg mv b c / hg mv c d
		- working to parent:
		A d
		c
		R c

		diff --git a/c b/d
		rename from c
		rename to d

		- working to root: --rev 0
		A d
		a
		R a

		diff --git a/a b/d
		rename from a
		rename to d
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	--- a/a
		+++ b/d
		@@ -1,1 +1,2 @@
		a
		+4
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- working to branch: --rev 2
		A d
		a
		R a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	R x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		diff --git a/a b/d
		rename from a
		rename to d
		--- a/a
		+++ b/d
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,2 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+4
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		deleted file mode 100644
		--- a/x/y
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- root to parent: --rev 0 --rev .
		A c
		a
		R a

		diff --git a/a b/c
		rename from a
		rename to c
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	--- a/a
		+++ b/c
		@@ -1,1 +1,2 @@
		a
		+4
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- parent to root: --rev . --rev 0
		A a
		c
		R c

		diff --git a/c b/a
		rename from c
		rename to a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	--- a/c
		+++ b/a
		@@ -1,2 +1,1 @@
		a
		-4
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- branch to parent: --rev 2 --rev .
		A c
		a
		R a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	R x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		diff --git a/a b/c
		rename from a
		rename to c
		--- a/a
		+++ b/c
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,2 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+4
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		deleted file mode 100644
		--- a/x/y
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- parent to branch: --rev . --rev 2
		A a
		c
Matt Mackall copies: skip directory rename checks when not merging...	r6425	A x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278	R c

		diff --git a/c b/a
		rename from c
		rename to a
		--- a/c
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,2 +1,3 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	-4
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+m1
		+m2
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		new file mode 100644
		--- /dev/null
		+++ b/x/y
		@@ -0,0 +1,1 @@
		+y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278

Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Matt Mackall copies: add tests for status -C/diff --git...	r6278	copy chain
		** hg cp a b / hg cp b c / hg cp c d
		- working to parent:
		A d
		c

		diff --git a/c b/d
		copy from c
		copy to d

		- working to root: --rev 0
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	M a
Matt Mackall copies: add tests for status -C/diff --git...	r6278	A b
		a
		A c
		a
		A d
		a

Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	diff --git a/a b/a
		--- a/a
		+++ b/a
		@@ -1,1 +1,2 @@
		a
		+5
Matt Mackall copies: add tests for status -C/diff --git...	r6278	diff --git a/a b/b
		copy from a
		copy to b
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	--- a/a
		+++ b/b
		@@ -1,1 +1,2 @@
		a
		+5
Matt Mackall copies: add tests for status -C/diff --git...	r6278	diff --git a/a b/c
		copy from a
		copy to c
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	--- a/a
		+++ b/c
		@@ -1,1 +1,2 @@
		a
		+5
Matt Mackall copies: add tests for status -C/diff --git...	r6278	diff --git a/a b/d
		copy from a
		copy to d
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	--- a/a
		+++ b/d
		@@ -1,1 +1,2 @@
		a
		+5
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- working to branch: --rev 2
		M a
		A b
		a
		A c
		a
		A d
		a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	R x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		diff --git a/a b/a
		--- a/a
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,2 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+5
Matt Mackall copies: add tests for status -C/diff --git...	r6278	diff --git a/a b/b
		copy from a
		copy to b
		--- a/a
		+++ b/b
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,2 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+5
Matt Mackall copies: add tests for status -C/diff --git...	r6278	diff --git a/a b/c
		copy from a
		copy to c
		--- a/a
		+++ b/c
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,2 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+5
Matt Mackall copies: add tests for status -C/diff --git...	r6278	diff --git a/a b/d
		copy from a
		copy to d
		--- a/a
		+++ b/d
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,2 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+5
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		deleted file mode 100644
		--- a/x/y
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- root to parent: --rev 0 --rev .
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	M a
Matt Mackall copies: add tests for status -C/diff --git...	r6278	A b
		a
		A c
		a

Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	diff --git a/a b/a
		--- a/a
		+++ b/a
		@@ -1,1 +1,2 @@
		a
		+5
Matt Mackall copies: add tests for status -C/diff --git...	r6278	diff --git a/a b/b
		copy from a
		copy to b
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	--- a/a
		+++ b/b
		@@ -1,1 +1,2 @@
		a
		+5
Matt Mackall copies: add tests for status -C/diff --git...	r6278	diff --git a/a b/c
		copy from a
		copy to c
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	--- a/a
		+++ b/c
		@@ -1,1 +1,2 @@
		a
		+5
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- parent to root: --rev . --rev 0
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	M a
Matt Mackall copies: add tests for status -C/diff --git...	r6278	R b
		R c

Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	diff --git a/a b/a
		--- a/a
		+++ b/a
		@@ -1,2 +1,1 @@
		a
		-5
Matt Mackall copies: add tests for status -C/diff --git...	r6278	diff --git a/b b/b
		deleted file mode 100644
		--- a/b
		+++ /dev/null
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,2 +0,0 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	-a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	-5
Matt Mackall copies: add tests for status -C/diff --git...	r6278	diff --git a/c b/c
		deleted file mode 100644
		--- a/c
		+++ /dev/null
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,2 +0,0 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	-a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	-5
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- branch to parent: --rev 2 --rev .
		M a
		A b
		a
		A c
		a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	R x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		diff --git a/a b/a
		--- a/a
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,2 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+5
Matt Mackall copies: add tests for status -C/diff --git...	r6278	diff --git a/a b/b
		copy from a
		copy to b
		--- a/a
		+++ b/b
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,2 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+5
Matt Mackall copies: add tests for status -C/diff --git...	r6278	diff --git a/a b/c
		copy from a
		copy to c
		--- a/a
		+++ b/c
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,3 +1,2 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
		-m1
		-m2
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	+5
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		deleted file mode 100644
		--- a/x/y
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278
		- parent to branch: --rev . --rev 2
		M a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	A x/y
Matt Mackall copies: add tests for status -C/diff --git...	r6278	R b
		R c

		diff --git a/a b/a
		--- a/a
		+++ b/a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,2 +1,3 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	-5
Matt Mackall copies: add tests for status -C/diff --git...	r6278	+m1
		+m2
		diff --git a/b b/b
		deleted file mode 100644
		--- a/b
		+++ /dev/null
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,2 +0,0 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	-a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	-5
Matt Mackall copies: add tests for status -C/diff --git...	r6278	diff --git a/c b/c
		deleted file mode 100644
		--- a/c
		+++ /dev/null
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	@@ -1,2 +0,0 @@
Matt Mackall copies: add tests for status -C/diff --git...	r6278	-a
Alexis S. L. Carvalho test-mv-cp-st-diff: avoid linkrev collisions...	r6282	-5
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		new file mode 100644
		--- /dev/null
		+++ b/x/y
		@@ -0,0 +1,1 @@
		+y1
Matt Mackall copies: add tests for status -C/diff --git...	r6278

Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Alexis S. L. Carvalho filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)...	r6286	circular rename
		** add a a1 / hg mv a b / hg mv b a
		- working to parent:
		A a
		b
		R b

		diff --git a/b b/a
		rename from b
		rename to a

		- working to root: --rev 0
		M a

		diff --git a/a b/a
		--- a/a
		+++ b/a
		@@ -1,1 +1,3 @@
		a
		+6
		+a1

		- working to branch: --rev 2
		M a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	R x/y
Alexis S. L. Carvalho filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)...	r6286
		diff --git a/a b/a
		--- a/a
		+++ b/a
		@@ -1,3 +1,3 @@
		a
		-m1
		-m2
		+6
		+a1
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		deleted file mode 100644
		--- a/x/y
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-y1
Alexis S. L. Carvalho filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)...	r6286
		- root to parent: --rev 0 --rev .
		A b
		a
		R a

		diff --git a/a b/b
		rename from a
		rename to b
		--- a/a
		+++ b/b
		@@ -1,1 +1,3 @@
		a
		+6
		+a1

		- parent to root: --rev . --rev 0
		A a
		b
		R b

		diff --git a/b b/a
		rename from b
		rename to a
		--- a/b
		+++ b/a
		@@ -1,3 +1,1 @@
		a
		-6
		-a1

		- branch to parent: --rev 2 --rev .
		A b
		a
		R a
Matt Mackall copies: skip directory rename checks when not merging...	r6425	R x/y
Alexis S. L. Carvalho filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)...	r6286
		diff --git a/a b/b
		rename from a
		rename to b
		--- a/a
		+++ b/b
		@@ -1,3 +1,3 @@
		a
		-m1
		-m2
		+6
		+a1
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		deleted file mode 100644
		--- a/x/y
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-y1
Alexis S. L. Carvalho filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)...	r6286
		- parent to branch: --rev . --rev 2
		A a
		b
Matt Mackall copies: skip directory rename checks when not merging...	r6425	A x/y
Alexis S. L. Carvalho filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)...	r6286	R b

		diff --git a/b b/a
		rename from b
		rename to a
		--- a/b
		+++ b/a
		@@ -1,3 +1,3 @@
		a
		-6
		-a1
		+m1
		+m2
Matt Mackall copies: skip directory rename checks when not merging...	r6425	diff --git a/x/y b/x/y
		new file mode 100644
		--- /dev/null
		+++ b/x/y
		@@ -0,0 +1,1 @@
		+y1
Alexis S. L. Carvalho filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)...	r6286

Matt Mackall copies: skip directory rename checks when not merging...	r6425	created new head
		moving x/x to y/x
		directory move
		** hg mv x y / add y/x x1 / add y/x x2
		- working to parent:
		M y/x

		diff --git a/y/x b/y/x
		--- a/y/x
		+++ b/y/x
		@@ -1,2 +1,3 @@
		x
		x1
		+x2

		- working to root: --rev 0
		M a
		A y/x
		x/x
		R x/x

		diff --git a/a b/a
		--- a/a
		+++ b/a
		@@ -1,1 +1,2 @@
		a
		+7
		diff --git a/x/x b/y/x
		rename from x/x
		rename to y/x
		--- a/x/x
		+++ b/y/x
		@@ -1,1 +1,3 @@
		x
		+x1
		+x2

		- working to branch: --rev 2
		M a
		A y/x
		x/x
		R x/x
		R x/y

		diff --git a/a b/a
		--- a/a
		+++ b/a
		@@ -1,3 +1,2 @@
		a
		-m1
		-m2
		+7
		diff --git a/x/y b/x/y
		deleted file mode 100644
		--- a/x/y
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-y1
		diff --git a/x/x b/y/x
		rename from x/x
		rename to y/x
		--- a/x/x
		+++ b/y/x
		@@ -1,1 +1,3 @@
		x
		+x1
		+x2

		- root to parent: --rev 0 --rev .
		M a
		A y/x
		x/x
		R x/x

		diff --git a/a b/a
		--- a/a
		+++ b/a
		@@ -1,1 +1,2 @@
		a
		+7
		diff --git a/x/x b/y/x
		rename from x/x
		rename to y/x
		--- a/x/x
		+++ b/y/x
		@@ -1,1 +1,2 @@
		x
		+x1

		- parent to root: --rev . --rev 0
		M a
		A x/x
		y/x
		R y/x

		diff --git a/a b/a
		--- a/a
		+++ b/a
		@@ -1,2 +1,1 @@
		a
		-7
		diff --git a/y/x b/x/x
		rename from y/x
		rename to x/x
		--- a/y/x
		+++ b/x/x
		@@ -1,2 +1,1 @@
		x
		-x1

		- branch to parent: --rev 2 --rev .
		M a
		A y/x
		x/x
		R x/x
		R x/y

		diff --git a/a b/a
		--- a/a
		+++ b/a
		@@ -1,3 +1,2 @@
		a
		-m1
		-m2
		+7
		diff --git a/x/y b/x/y
		deleted file mode 100644
		--- a/x/y
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-y1
		diff --git a/x/x b/y/x
		rename from x/x
		rename to y/x
		--- a/x/x
		+++ b/y/x
		@@ -1,1 +1,2 @@
		x
		+x1

		- parent to branch: --rev . --rev 2
		M a
		A x/x
		y/x
		A x/y
		R y/x

		diff --git a/a b/a
		--- a/a
		+++ b/a
		@@ -1,2 +1,3 @@
		a
		-7
		+m1
		+m2
		diff --git a/y/x b/x/x
		rename from y/x
		rename to x/x
		--- a/y/x
		+++ b/x/x
		@@ -1,2 +1,1 @@
		x
		-x1
		diff --git a/x/y b/x/y
		new file mode 100644
		--- /dev/null
		+++ b/x/y
		@@ -0,0 +1,1 @@
		+y1

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages