Mercurial: tests/test-url-rev.t annotate

annotate tests/test-url-rev.t @ 14480:a21246c7e7d7

merge with crew

author	Matt Mackall <mpm@selenic.com>
date	Tue, 31 May 2011 15:26:02 -0500
parents	1e497df514e2
children	7c26ce9edbd2

rev	line source
12328 b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests Matt Mackall <mpm@selenic.com> parents: 12300 diff changeset	1 Test basic functionality of url#rev syntax
5222 cbe6e263357b parseurl: also return the revision after the "#"; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	2
12300 ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	3 $ hg init repo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	4 $ cd repo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	5 $ echo a > a
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	6 $ hg ci -qAm 'add a'
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	7 $ hg branch foo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	8 marked working directory as branch foo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	9 $ echo >> a
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	10 $ hg ci -m 'change a'
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	11 $ cd ..
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	12
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	13 $ hg clone 'repo#foo' clone
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	14 adding changesets
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	15 adding manifests
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	16 adding file changes
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	17 added 2 changesets with 2 changes to 1 files
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	18 updating to branch foo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	19 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5222 cbe6e263357b parseurl: also return the revision after the "#"; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	20
12300 ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	21 $ hg --cwd clone heads
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	22 changeset: 1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	23 branch: foo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	24 tag: tip
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	25 user: test
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	26 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	27 summary: change a
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	28
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	29 changeset: 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	30 user: test
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	31 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	32 summary: add a
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	33
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	34 $ hg --cwd clone parents
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	35 changeset: 1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	36 branch: foo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	37 tag: tip
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	38 user: test
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	39 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	40 summary: change a
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	41
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	42 $ cat clone/.hg/hgrc
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	43 [paths]
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12376 diff changeset	44 default = $TESTTMP/repo#foo
12300 ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	45
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	46 Changing original repo:
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	47
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	48 $ cd repo
5222 cbe6e263357b parseurl: also return the revision after the "#"; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	49
12300 ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	50 $ echo >> a
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	51 $ hg ci -m 'new head of branch foo'
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	52
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	53 $ hg up -qC default
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	54 $ echo bar > bar
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	55 $ hg ci -qAm 'add bar'
5222 cbe6e263357b parseurl: also return the revision after the "#"; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	56
12300 ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	57 $ hg log
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	58 changeset: 3:4cd725637392
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	59 tag: tip
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	60 parent: 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	61 user: test
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	62 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	63 summary: add bar
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	64
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	65 changeset: 2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	66 branch: foo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	67 user: test
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	68 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	69 summary: new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	70
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	71 changeset: 1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	72 branch: foo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	73 user: test
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	74 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	75 summary: change a
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	76
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	77 changeset: 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	78 user: test
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	79 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	80 summary: add a
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	81
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	82 $ hg -q outgoing '../clone#foo'
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	83 2:faba9097cad4
5222 cbe6e263357b parseurl: also return the revision after the "#"; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	84
12300 ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	85 $ hg -q push '../clone#foo'
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	86
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	87 $ hg --cwd ../clone heads
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	88 changeset: 2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	89 branch: foo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	90 tag: tip
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	91 user: test
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	92 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	93 summary: new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	94
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	95 changeset: 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	96 user: test
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	97 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	98 summary: add a
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	99
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	100 $ cd ..
5222 cbe6e263357b parseurl: also return the revision after the "#"; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	101
12300 ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	102 $ cd clone
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	103 $ hg rollback
13446 1e497df514e2 rollback: clarifies the message about the reverted state (issue2628) Gilles Moris <gilles.moris@free.fr> parents: 12847 diff changeset	104 repository tip rolled back to revision 1 (undo push)
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628) Gilles Moris <gilles.moris@free.fr> parents: 12847 diff changeset	105 working directory now based on revision 1
12300 ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	106
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	107 $ hg -q incoming
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	108 2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	109
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	110 $ hg -q pull
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	111
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	112 $ hg heads
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	113 changeset: 2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	114 branch: foo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	115 tag: tip
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	116 user: test
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	117 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	118 summary: new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	119
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	120 changeset: 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	121 user: test
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	122 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	123 summary: add a
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	124
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	125 Pull should not have updated:
5222 cbe6e263357b parseurl: also return the revision after the "#"; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	126
12300 ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	127 $ hg parents -q
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	128 1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	129
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	130 Going back to the default branch:
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	131
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	132 $ hg up -C 0
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	133 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5222 cbe6e263357b parseurl: also return the revision after the "#"; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	134
12300 ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	135 $ hg parents
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	136 changeset: 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	137 user: test
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	138 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	139 summary: add a
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	140
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	141 No new revs, no update:
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	142
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	143 $ hg pull -qu
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	144
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	145 $ hg parents -q
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	146 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	147
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	148 $ hg rollback
13446 1e497df514e2 rollback: clarifies the message about the reverted state (issue2628) Gilles Moris <gilles.moris@free.fr> parents: 12847 diff changeset	149 repository tip rolled back to revision 1 (undo pull)
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628) Gilles Moris <gilles.moris@free.fr> parents: 12847 diff changeset	150 working directory now based on revision 1
12300 ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	151
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	152 $ hg up -C 0
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	153 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5222 cbe6e263357b parseurl: also return the revision after the "#"; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: diff changeset	154
12300 ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	155 $ hg parents -q
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	156 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	157
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	158 Pull -u takes us back to branch foo:
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	159
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	160 $ hg pull -qu
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	161
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	162 $ hg parents
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	163 changeset: 2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	164 branch: foo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	165 tag: tip
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	166 user: test
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	167 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	168 summary: new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	169
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	170 $ hg rollback
13446 1e497df514e2 rollback: clarifies the message about the reverted state (issue2628) Gilles Moris <gilles.moris@free.fr> parents: 12847 diff changeset	171 repository tip rolled back to revision 1 (undo pull)
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628) Gilles Moris <gilles.moris@free.fr> parents: 12847 diff changeset	172 working directory now based on revision 0
12300 ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	173
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	174 $ hg up -C 0
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	176
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	177 $ hg parents -q
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	178 0:1f0dee641bb7
5224 20817af258d8 pull -u: if "url#rev" was given, update to rev Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5223 diff changeset	179
12300 ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	180 $ hg heads -q
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	181 1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	182 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	183
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	184 $ hg pull -qur default default
5224 20817af258d8 pull -u: if "url#rev" was given, update to rev Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5223 diff changeset	185
12300 ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	186 $ hg parents
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	187 changeset: 3:4cd725637392
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	188 tag: tip
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	189 parent: 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	190 user: test
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	191 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	192 summary: add bar
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	193
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	194 $ hg heads
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	195 changeset: 3:4cd725637392
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	196 tag: tip
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	197 parent: 0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	198 user: test
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	199 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	200 summary: add bar
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	201
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	202 changeset: 2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	203 branch: foo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	204 user: test
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	205 date: Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	206 summary: new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	207
ca31b0b2ac16 tests: unify test-url-rev Adrian Buehlmann <adrian@cadifra.com> parents: 8167 diff changeset	208

Mercurial > hg

annotate tests/test-url-rev.t @ 14480:a21246c7e7d7