evolve: tests/test-evolve.t annotate

annotate tests/test-evolve.t @ 1325:1fe3da0b4601

evolve: add --rev option to the evolve command This patch is part of a series of patches to refactor the evolve method and make it more readable. We introduce a new --rev flag to specify a revset where to solve the troubles instead of looking from the parent changeset. All add a test checks that --rev works with several commits

author	Laurent Charignon <lcharignon@fb.com>
date	Tue, 05 May 2015 14:25:59 -0700
parents	35d8789ea7a8
children	5e82d78f5872

rev	line source
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	1 $ cat >> $HGRCPATH <<EOF
113 3bdabdbb4140 adapt evolution to phase in core. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 94 diff changeset	2 > [defaults]
3bdabdbb4140 adapt evolution to phase in core. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 94 diff changeset	3 > amend=-d "0 0"
915 1ebe5c51919b fold: enable --date and --user options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 901 diff changeset	4 > fold=-d "0 0"
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	5 > [web]
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	6 > push_ssl = false
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	7 > allow_push = *
113 3bdabdbb4140 adapt evolution to phase in core. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 94 diff changeset	8 > [phases]
3bdabdbb4140 adapt evolution to phase in core. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 94 diff changeset	9 > publish = False
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	10 > [alias]
113 3bdabdbb4140 adapt evolution to phase in core. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 94 diff changeset	11 > qlog = log --template='{rev} - {node\|short} {desc} ({phase})\n'
82 8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	12 > [diff]
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	13 > git = 1
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	14 > unified = 0
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	15 > [extensions]
113 3bdabdbb4140 adapt evolution to phase in core. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 94 diff changeset	16 > hgext.graphlog=
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	17 > EOF
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	18 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	19 $ mkcommit() {
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	20 > echo "$1" > "$1"
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	21 > hg add "$1"
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	22 > hg ci -m "add $1"
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	23 > }
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	24
296 c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	25 $ glog() {
c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	26 > hg glog --template '{rev}:{node\|short}@{branch}({phase}) {desc\|firstline}\n' "$@"
c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	27 > }
c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	28
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	29 various init
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	30
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	31 $ hg init local
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	32 $ cd local
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	33 $ mkcommit a
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	34 $ mkcommit b
113 3bdabdbb4140 adapt evolution to phase in core. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 94 diff changeset	35 $ cat >> .hg/hgrc << EOF
3bdabdbb4140 adapt evolution to phase in core. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 94 diff changeset	36 > [phases]
3bdabdbb4140 adapt evolution to phase in core. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 94 diff changeset	37 > publish = True
3bdabdbb4140 adapt evolution to phase in core. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 94 diff changeset	38 > EOF
3bdabdbb4140 adapt evolution to phase in core. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 94 diff changeset	39 $ hg pull -q . # make 1 public
3bdabdbb4140 adapt evolution to phase in core. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 94 diff changeset	40 $ rm .hg/hgrc
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	41 $ mkcommit c
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	42 $ mkcommit d
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	43 $ hg up 1
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	44 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	45 $ mkcommit e -q
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	46 created new head
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	47 $ mkcommit f
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	48 $ hg qlog
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	49 5 - e44648563c73 add f (draft)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	50 4 - fbb94e3a0ecf add e (draft)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	51 3 - 47d2a3944de8 add d (draft)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	52 2 - 4538525df7e2 add c (draft)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	53 1 - 7c3bad9141dc add b (public)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	54 0 - 1f0dee641bb7 add a (public)
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	55
414 299af91b8b6e evolve: tweak and add EOL to kill warning Patrick Mezard <patrick@mezard.eu> parents: 317 diff changeset	56 test kill and immutable changeset
299af91b8b6e evolve: tweak and add EOL to kill warning Patrick Mezard <patrick@mezard.eu> parents: 317 diff changeset	57
299af91b8b6e evolve: tweak and add EOL to kill warning Patrick Mezard <patrick@mezard.eu> parents: 317 diff changeset	58 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
299af91b8b6e evolve: tweak and add EOL to kill warning Patrick Mezard <patrick@mezard.eu> parents: 317 diff changeset	59 1 public stable
299af91b8b6e evolve: tweak and add EOL to kill warning Patrick Mezard <patrick@mezard.eu> parents: 317 diff changeset	60 $ hg kill 1
687 6c1fbef2952e prune: test and improve message of immutable aborting. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 652 diff changeset	61 abort: cannot prune immutable changeset: 7c3bad9141dc
6c1fbef2952e prune: test and improve message of immutable aborting. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 652 diff changeset	62 (see "hg help phases" for details)
444 aedb6b8ace86 drop repo.addobsolete Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 443 diff changeset	63 [255]
414 299af91b8b6e evolve: tweak and add EOL to kill warning Patrick Mezard <patrick@mezard.eu> parents: 317 diff changeset	64 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
299af91b8b6e evolve: tweak and add EOL to kill warning Patrick Mezard <patrick@mezard.eu> parents: 317 diff changeset	65 1 public stable
299af91b8b6e evolve: tweak and add EOL to kill warning Patrick Mezard <patrick@mezard.eu> parents: 317 diff changeset	66
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	67 test simple kill
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	68
317 c099ed0dd472 evolve: improve kill testing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 309 diff changeset	69 $ hg id -n
c099ed0dd472 evolve: improve kill testing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 309 diff changeset	70 5
c099ed0dd472 evolve: improve kill testing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 309 diff changeset	71 $ hg kill .
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	72 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	73 working directory now at fbb94e3a0ecf
1239 8a06b32061ce evolve: apply prune update before creating obsolescence markers Laurent Charignon <lcharignon@fb.com> parents: 1197 diff changeset	74 1 changesets pruned
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	75 $ hg qlog
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	76 4 - fbb94e3a0ecf add e (draft)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	77 3 - 47d2a3944de8 add d (draft)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	78 2 - 4538525df7e2 add c (draft)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	79 1 - 7c3bad9141dc add b (public)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	80 0 - 1f0dee641bb7 add a (public)
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	81
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	82 test multiple kill
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	83
644 8e41d5b78dff support -r option in prune, add a test for this Denis Laxalde <denis.laxalde@logilab.fr> parents: 620 diff changeset	84 $ hg kill 4 -r 3
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	85 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	86 working directory now at 7c3bad9141dc
1239 8a06b32061ce evolve: apply prune update before creating obsolescence markers Laurent Charignon <lcharignon@fb.com> parents: 1197 diff changeset	87 2 changesets pruned
81 5cec25ce019c Basic kill command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: diff changeset	88 $ hg qlog
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	89 2 - 4538525df7e2 add c (draft)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	90 1 - 7c3bad9141dc add b (public)
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	91 0 - 1f0dee641bb7 add a (public)
317 c099ed0dd472 evolve: improve kill testing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 309 diff changeset	92
c099ed0dd472 evolve: improve kill testing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 309 diff changeset	93 test kill with dirty changes
c099ed0dd472 evolve: improve kill testing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 309 diff changeset	94
c099ed0dd472 evolve: improve kill testing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 309 diff changeset	95 $ hg up 2
c099ed0dd472 evolve: improve kill testing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 309 diff changeset	96 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c099ed0dd472 evolve: improve kill testing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 309 diff changeset	97 $ echo 4 > g
c099ed0dd472 evolve: improve kill testing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 309 diff changeset	98 $ hg add g
c099ed0dd472 evolve: improve kill testing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 309 diff changeset	99 $ hg kill .
c099ed0dd472 evolve: improve kill testing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 309 diff changeset	100 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
c099ed0dd472 evolve: improve kill testing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 309 diff changeset	101 working directory now at 7c3bad9141dc
1239 8a06b32061ce evolve: apply prune update before creating obsolescence markers Laurent Charignon <lcharignon@fb.com> parents: 1197 diff changeset	102 1 changesets pruned
317 c099ed0dd472 evolve: improve kill testing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 309 diff changeset	103 $ hg st
c099ed0dd472 evolve: improve kill testing Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 309 diff changeset	104 A g
1279 064cf9ee4460 debugobsrelsethashtree: get the command to work again Pierre-Yves David <pierre-yves.david@fb.com> parents: 1197 diff changeset	105
064cf9ee4460 debugobsrelsethashtree: get the command to work again Pierre-Yves David <pierre-yves.david@fb.com> parents: 1197 diff changeset	106 Smoketest debugobsrelsethashtree:
064cf9ee4460 debugobsrelsethashtree: get the command to work again Pierre-Yves David <pierre-yves.david@fb.com> parents: 1197 diff changeset	107
064cf9ee4460 debugobsrelsethashtree: get the command to work again Pierre-Yves David <pierre-yves.david@fb.com> parents: 1197 diff changeset	108 $ hg debugobsrelsethashtree
064cf9ee4460 debugobsrelsethashtree: get the command to work again Pierre-Yves David <pierre-yves.david@fb.com> parents: 1197 diff changeset	109 1f0dee641bb7258c56bd60e93edfa2405381c41e 0000000000000000000000000000000000000000
064cf9ee4460 debugobsrelsethashtree: get the command to work again Pierre-Yves David <pierre-yves.david@fb.com> parents: 1197 diff changeset	110 7c3bad9141dcb46ff89abf5f61856facd56e476c * (glob)
064cf9ee4460 debugobsrelsethashtree: get the command to work again Pierre-Yves David <pierre-yves.david@fb.com> parents: 1197 diff changeset	111 4538525df7e2b9f09423636c61ef63a4cb872a2d * (glob)
064cf9ee4460 debugobsrelsethashtree: get the command to work again Pierre-Yves David <pierre-yves.david@fb.com> parents: 1197 diff changeset	112 47d2a3944de8b013de3be9578e8e344ea2e6c097 * (glob)
064cf9ee4460 debugobsrelsethashtree: get the command to work again Pierre-Yves David <pierre-yves.david@fb.com> parents: 1197 diff changeset	113 fbb94e3a0ecf6d20c2cc31152ef162ce45af982f * (glob)
064cf9ee4460 debugobsrelsethashtree: get the command to work again Pierre-Yves David <pierre-yves.david@fb.com> parents: 1197 diff changeset	114 e44648563c73f75950076031c6fdf06629de95f1 * (glob)
064cf9ee4460 debugobsrelsethashtree: get the command to work again Pierre-Yves David <pierre-yves.david@fb.com> parents: 1197 diff changeset	115
82 8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	116 $ cd ..
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	117
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	118 ##########################
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	119 importing Parren test
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	120 ##########################
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	121
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	122 $ cat << EOF >> $HGRCPATH
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	123 > [ui]
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	124 > logtemplate = "{rev}\t{bookmarks}: {desc\|firstline} - {author\|user}\n"
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	125 > EOF
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	126
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	127 Creating And Updating Changeset
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	128 ===============================
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	129
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	130 Setup the Base Repo
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	131 -------------------
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	132
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	133 We start with a plain base repo::
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	134
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	135 $ hg init main; cd main
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	136 $ cat >main-file-1 <<-EOF
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	137 > One
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	138 >
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	139 > Two
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	140 >
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	141 > Three
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	142 > EOF
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	143 $ echo Two >main-file-2
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	144 $ hg add
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	145 adding main-file-1
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	146 adding main-file-2
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	147 $ hg commit --message base
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	148 $ cd ..
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	149
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	150 and clone this into a new repo where we do our work::
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	151
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	152 $ hg clone main work
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	153 updating to branch default
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	154 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	155 $ cd work
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	156
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	157
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	158 Create First Patch
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	159 ------------------
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	160
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	161 To begin with, we just do the changes that will be the initial version of the changeset::
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	162
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	163 $ echo One >file-from-A
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	164 $ sed -i'' -e s/One/Eins/ main-file-1
82 8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	165 $ hg add file-from-A
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	166
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	167 So this is what we would like our changeset to be::
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	168
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	169 $ hg diff
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	170 diff --git a/file-from-A b/file-from-A
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	171 new file mode 100644
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	172 --- /dev/null
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	173 +++ b/file-from-A
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	174 @@ -0,0 +1,1 @@
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	175 +One
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	176 diff --git a/main-file-1 b/main-file-1
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	177 --- a/main-file-1
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	178 +++ b/main-file-1
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	179 @@ -1,1 +1,1 @@
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	180 -One
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	181 +Eins
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	182
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	183 To commit it we just - commit it::
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	184
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	185 $ hg commit --message "a nifty feature"
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	186
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	187 and place a bookmark so we can easily refer to it again (which we could have done before the commit)::
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	188
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	189 $ hg book feature-A
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	190
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	191
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	192 Create Second Patch
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	193 -------------------
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	194
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	195 Let's do this again for the second changeset::
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	196
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	197 $ echo Two >file-from-B
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	198 $ sed -i'' -e s/Two/Zwie/ main-file-1
82 8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	199 $ hg add file-from-B
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	200
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	201 Before committing, however, we need to switch to a new bookmark for the second
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	202 changeset. Otherwise we would inadvertently move the bookmark for our first changeset.
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	203 It is therefore advisable to always set the bookmark before committing::
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	204
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	205 $ hg book feature-B
1105 836c4128c027 test: add parent hash to commit message in test-evolve.t Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	206 $ hg commit --message "another feature (child of $(hg log -r . -T '{node\|short}'))"
82 8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	207
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	208 So here we are::
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	209
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	210 $ hg book
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	211 feature-A 1:568a468b60fc
1105 836c4128c027 test: add parent hash to commit message in test-evolve.t Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	212 * feature-B 2:73296a82292a
82 8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	213
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	214
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	215 Fix The Second Patch
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	216 --------------------
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	217
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	218 There's a typo in feature-B. We spelled Zwie instead of Zwei::
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	219
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	220 $ hg diff --change tip \| grep -F Zwie
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	221 +Zwie
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	222
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	223 Fixing this is very easy. Just change::
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	224
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	225 $ sed -i'' -e s/Zwie/Zwei/ main-file-1
82 8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	226
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	227 and amend::
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	228
741 892a6d708c8f amend: drop the deprecated note option Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 718 diff changeset	229 $ hg amend
82 8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	230
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	231 This results in a new single changeset for our amended changeset, and the old
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	232 changeset plus the updating changeset are hidden from view by default::
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	233
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	234 $ hg log
1105 836c4128c027 test: add parent hash to commit message in test-evolve.t Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	235 4 feature-B: another feature (child of 568a468b60fc) - test
82 8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	236 1 feature-A: a nifty feature - test
8108d566a8b5 [evolution] imported hg amend from parren works Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 81 diff changeset	237 0 : base - test
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	238
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	239 $ hg up feature-A -q
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 138 diff changeset	240 $ hg bookmark -i feature-A
88 64fe5a4f877e [evolution] first workign draft of a relocate function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 87 diff changeset	241 $ sed -i'' -e s/Eins/Un/ main-file-1
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	242
475 9f69a5e41ab0 [evolve] amend: check phase before starting the transition Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 474 diff changeset	243 (amend of public changeset denied)
9f69a5e41ab0 [evolve] amend: check phase before starting the transition Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 474 diff changeset	244
474 5c031e1c90e2 test: turn the base public Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 418 diff changeset	245 $ hg phase --public 0 -v
5c031e1c90e2 test: turn the base public Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 418 diff changeset	246 phase changed for 1 changesets
475 9f69a5e41ab0 [evolve] amend: check phase before starting the transition Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 474 diff changeset	247
9f69a5e41ab0 [evolve] amend: check phase before starting the transition Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 474 diff changeset	248
476 f17a0f801e0b [evolve] amend: display proper error message while trying to amend non ancestor Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 475 diff changeset	249 (amend of on ancestors)
f17a0f801e0b [evolve] amend: display proper error message while trying to amend non ancestor Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 475 diff changeset	250
741 892a6d708c8f amend: drop the deprecated note option Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 718 diff changeset	251 $ hg amend
486 2111c655b4f5 fix typo Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 483 diff changeset	252 1 new unstable changesets
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	253 $ hg log
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	254 6 feature-A: a nifty feature - test
1105 836c4128c027 test: add parent hash to commit message in test-evolve.t Matt Harbison <matt_harbison@yahoo.com> parents: 1104 diff changeset	255 4 feature-B: another feature (child of 568a468b60fc) - test
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	256 1 : a nifty feature - test
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	257 0 : base - test
302 d68ccae92d52 obsolete: make collapse create less markers Patrick Mezard <patrick@mezard.eu> parents: 296 diff changeset	258 $ hg up -q 0
296 c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	259 $ glog --hidden
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 741 diff changeset	260 o 6:ba0ec09b1bab@default(draft) a nifty feature
296 c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	261 \|
742 760d01a549a6 amend: use core mechanism for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 741 diff changeset	262 \| x 5:c296b79833d1@default(draft) temporary amend commit for 568a468b60fc
296 c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	263 \| \|
1104 cb36a4eb0157 evolve: fix the 'grab' alias to work on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 1099 diff changeset	264 \| \| o 4:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
296 c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	265 \| \|/
1104 cb36a4eb0157 evolve: fix the 'grab' alias to work on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 1099 diff changeset	266 \| \| x 3:c97947cdc7a2@default(draft) temporary amend commit for 73296a82292a
296 c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	267 \| \| \|
1104 cb36a4eb0157 evolve: fix the 'grab' alias to work on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 1099 diff changeset	268 \| \| x 2:73296a82292a@default(draft) another feature (child of 568a468b60fc)
296 c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	269 \| \|/
346 f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc Patrick Mezard <patrick@mezard.eu> parents: 317 diff changeset	270 \| x 1:568a468b60fc@default(draft) a nifty feature
296 c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	271 \|/
474 5c031e1c90e2 test: turn the base public Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 418 diff changeset	272 @ 0:e55e0562ee93@default(public) base
296 c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug Patrick Mezard <patrick@mezard.eu> parents: 269 diff changeset	273
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 420 diff changeset	274 $ hg debugobsolete
1104 cb36a4eb0157 evolve: fix the 'grab' alias to work on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 1099 diff changeset	275 73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'user': 'test'} (glob)
cb36a4eb0157 evolve: fix the 'grab' alias to work on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 1099 diff changeset	276 c97947cdc7a2a11cf78419f5c2c3dd3944ec79e8 0 {73296a82292a76fb8a7061969d2489ec0d84cd5e} (*) {'user': 'test'} (glob)
1065 f355bbc124fc test: update test to new date formatting in debuobsolete output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1040 diff changeset	277 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'user': 'test'} (glob)
1067 5d063fed9e3d evolve: yield to relevant markers handling in core Pierre-Yves David <pierre-yves.david@fb.com> parents: 1065 diff changeset	278 c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'user': 'test'} (glob)
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	279 $ hg evolve
1104 cb36a4eb0157 evolve: fix the 'grab' alias to work on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 1099 diff changeset	280 move:[4] another feature (child of 568a468b60fc)
139 9b9500175ae5 evolve that does something \o/ Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 138 diff changeset	281 atop:[6] a nifty feature
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	282 merging main-file-1
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1105 diff changeset	283 working directory is now at 5c9c8d9c2e4e
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	284 $ hg log
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1105 diff changeset	285 7 feature-B: another feature (child of ba0ec09b1bab) - test
87 246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	286 6 feature-A: a nifty feature - test
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 82 diff changeset	287 0 : base - test
116 64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	288
64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	289 Test commit -o options
64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	290
64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	291 $ hg up 6
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	292 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
116 64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	293 $ hg revert -r 7 --all
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	294 adding file-from-B
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	295 reverting main-file-1
116 64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	296 $ sed -i'' -e s/Zwei/deux/ main-file-1
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	297 $ hg commit -m 'another feature that rox' -o 7
bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	298 created new head
116 64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	299 $ hg log
137 bbc653876876 fix evolve test Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 116 diff changeset	300 8 feature-B: another feature that rox - test
116 64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	301 6 feature-A: a nifty feature - test
64ca29eef349 Add a -o option to commit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 113 diff changeset	302 0 : base - test
309 de21685d22d1 evolve: warn when latecomer changeset are created Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 302 diff changeset	303
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 561 diff changeset	304 phase change turning obsolete changeset public issue a bumped warning
309 de21685d22d1 evolve: warn when latecomer changeset are created Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 302 diff changeset	305
625 e291e5271694 prepare for Full scale filtering !!! Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 620 diff changeset	306 $ hg phase --hidden --public 7
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 561 diff changeset	307 1 new bumped changesets
309 de21685d22d1 evolve: warn when latecomer changeset are created Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 302 diff changeset	308
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 561 diff changeset	309 all solving bumped troubled
468 6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	310
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	311 $ hg glog
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	312 @ 8 feature-B: another feature that rox - test
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	313 \|
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1105 diff changeset	314 \| o 7 : another feature (child of ba0ec09b1bab) - test
468 6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	315 \|/
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	316 o 6 feature-A: a nifty feature - test
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	317 \|
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	318 o 0 : base - test
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	319
492 7ecd41520dae rename `stabilize` to `evolve` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 491 diff changeset	320 $ hg evolve --any --traceback
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	321 recreate:[8] another feature that rox
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1105 diff changeset	322 atop:[7] another feature (child of ba0ec09b1bab)
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	323 computing new diff
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1105 diff changeset	324 committed as 476d0454d60e
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1105 diff changeset	325 working directory is now at 476d0454d60e
468 6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	326 $ hg glog
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1105 diff changeset	327 @ 9 feature-B: bumped update to 5c9c8d9c2e4e: - test
468 6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	328 \|
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1105 diff changeset	329 o 7 : another feature (child of ba0ec09b1bab) - test
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	330 \|
468 6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	331 o 6 feature-A: a nifty feature - test
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	332 \|
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	333 o 0 : base - test
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	334
625 e291e5271694 prepare for Full scale filtering !!! Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 620 diff changeset	335 $ hg diff --hidden -r 9 -r 8
469 abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	336 $ hg diff -r 9^ -r 9
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	337 diff --git a/main-file-1 b/main-file-1
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	338 --- a/main-file-1
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	339 +++ b/main-file-1
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	340 @@ -3,1 +3,1 @@
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	341 -Zwei
abeb17a9e313 stabilize: handle latecomer Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 468 diff changeset	342 +deux
593 26f76b38f879 evolve: Rename latecomer into bumped Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 561 diff changeset	343 $ hg log -r 'bumped()' # no more bumped
468 6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 446 diff changeset	344
705 4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	345 test evolve --all
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	346 $ sed -i'' -e s/deux/to/ main-file-1
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	347 $ hg commit -m 'dansk 2!'
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	348 $ sed -i'' -e s/Three/tre/ main-file-1
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	349 $ hg commit -m 'dansk 3!'
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	350 $ hg update 9
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	351 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	352 $ sed -i'' -e s/Un/Én/ main-file-1
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	353 $ hg commit --amend -m 'dansk!'
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	354 2 new unstable changesets
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	355
982 1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	356 (ninja test for the {trouble} template:
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	357
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	358 $ hg log -G --template '{rev} {troubles}\n'
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	359 @ 13
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	360 \|
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	361 \| o 11 unstable
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	362 \| \|
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	363 \| o 10 unstable
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	364 \| \|
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	365 \| x 9
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	366 \|/
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	367 o 7
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	368 \|
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	369 o 6
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	370 \|
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	371 o 0
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	372
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	373
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	374
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	375 (/ninja)
1c7b73739a0d template: add a troubles keyword Pierre-Yves David <pierre-yves.david@fb.com> parents: 964 diff changeset	376
705 4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	377 $ hg evolve --all --traceback
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	378 move:[10] dansk 2!
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	379 atop:[13] dansk!
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	380 merging main-file-1
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	381 move:[11] dansk 3!
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	382 atop:[14] dansk 2!
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	383 merging main-file-1
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1105 diff changeset	384 working directory is now at cfb5ebed336d
705 4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	385 $ hg glog
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	386 @ 15 : dansk 3! - test
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	387 \|
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	388 o 14 : dansk 2! - test
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	389 \|
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	390 o 13 feature-B: dansk! - test
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	391 \|
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1105 diff changeset	392 o 7 : another feature (child of ba0ec09b1bab) - test
705 4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	393 \|
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	394 o 6 feature-A: a nifty feature - test
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	395 \|
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	396 o 0 : base - test
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	397
4884111bcb92 evolve: add test for evolve --all. Levi Bard <levi@unity3d.com> parents: 652 diff changeset	398
196 dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	399 $ cd ..
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	400
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	401 enable general delta
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	402
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	403 $ cat << EOF >> $HGRCPATH
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	404 > [format]
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	405 > generaldelta=1
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	406 > EOF
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	407
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	408
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	409
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	410 $ hg init alpha
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	411 $ cd alpha
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	412 $ echo 'base' > firstfile
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	413 $ hg add firstfile
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	414 $ hg ci -m 'base'
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	415
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	416 $ cd ..
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	417 $ hg clone -Ur 0 alpha beta
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	418 adding changesets
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	419 adding manifests
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	420 adding file changes
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	421 added 1 changesets with 1 changes to 1 files
1038 45c4739e85dc evolve: make the "pulling obsolescence marker" message important Pierre-Yves David <pierre-yves.david@fb.com> parents: 1035 diff changeset	422 pull obsolescence markers
196 dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	423 $ cd alpha
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	424
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	425 $ cat << EOF > A
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	426 > We
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	427 > need
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	428 > some
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	429 > kind
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	430 > of
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	431 > file
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	432 > big
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	433 > enough
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	434 > to
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	435 > prevent
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	436 > snapshot
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	437 > .
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	438 > yes
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	439 > new
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	440 > lines
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	441 > are
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	442 > useless
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	443 > .
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	444 > EOF
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	445 $ hg add A
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	446 $ hg commit -m 'adding A'
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	447 $ hg mv A B
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	448 $ echo '.' >> B
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	449 $ hg amend -m 'add B'
219 cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	450 $ hg verify
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	451 checking changesets
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	452 checking manifests
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	453 crosschecking files in changesets and manifests
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	454 checking files
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	455 3 files, 4 changesets, 4 total revisions
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	456 $ hg --config extensions.hgext.mq= strip 'extinct()'
625 e291e5271694 prepare for Full scale filtering !!! Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 620 diff changeset	457 abort: empty revision set
e291e5271694 prepare for Full scale filtering !!! Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 620 diff changeset	458 [255]
e291e5271694 prepare for Full scale filtering !!! Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 620 diff changeset	459 $ hg --config extensions.hgext.mq= strip --hidden 'extinct()'
1195 af9fd422adbb tests: update to new core output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1188 diff changeset	460 saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-d7bd82e9-backup.hg (glob)
219 cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	461 $ hg verify
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	462 checking changesets
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	463 checking manifests
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	464 crosschecking files in changesets and manifests
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	465 checking files
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions. Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 196 diff changeset	466 2 files, 2 changesets, 2 total revisions
196 dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	467 $ cd ..
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	468
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	469 Clone just this branch
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	470
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	471 $ cd beta
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	472 $ hg pull -r tip ../alpha
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	473 pulling from ../alpha
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	474 searching for changes
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	475 adding changesets
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	476 adding manifests
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	477 adding file changes
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	478 added 1 changesets with 1 changes to 1 files
1038 45c4739e85dc evolve: make the "pulling obsolescence marker" message important Pierre-Yves David <pierre-yves.david@fb.com> parents: 1035 diff changeset	479 pull obsolescence markers
1040 640f3280559e evolve: add "obsolescence" in front of marked in the previous message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1039 diff changeset	480 2 obsolescence markers added
196 dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	481 (run 'hg update' to get a working copy)
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	482 $ hg up
dea67dae27a4 amend: add a warning after amend added unstablility Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 145 diff changeset	483 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
418 18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	484
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	485 $ cd ..
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	486
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	487 Test graft --obsolete/--old-obsolete
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	488
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	489 $ hg init test-graft
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	490 $ cd test-graft
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	491 $ mkcommit 0
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	492 $ mkcommit 1
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	493 $ mkcommit 2
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	494 $ mkcommit 3
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	495 $ hg up -qC 0
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	496 $ mkcommit 4
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	497 created new head
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	498 $ glog --hidden
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	499 @ 4:ce341209337f@default(draft) add 4
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	500 \|
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	501 \| o 3:0e84df4912da@default(draft) add 3
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	502 \| \|
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	503 \| o 2:db038628b9e5@default(draft) add 2
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	504 \| \|
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	505 \| o 1:73d38bb17fd7@default(draft) add 1
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	506 \|/
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	507 o 0:8685c6d34325@default(draft) add 0
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	508
419 03672e955bc8 evolve: make graft wrapper handle --rev Patrick Mezard <patrick@mezard.eu> parents: 385 diff changeset	509 $ hg graft -r3 -O
1188 0c879e986ce4 test: adapt to core change in graft and rebase Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	510 grafting 3:0e84df4912da "add 3"
419 03672e955bc8 evolve: make graft wrapper handle --rev Patrick Mezard <patrick@mezard.eu> parents: 385 diff changeset	511 $ hg graft -r1 -o 2
1188 0c879e986ce4 test: adapt to core change in graft and rebase Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	512 grafting 1:73d38bb17fd7 "add 1"
418 18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	513 $ glog --hidden
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	514 @ 6:acb28cd497b7@default(draft) add 1
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	515 \|
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	516 o 5:0b9e50c35132@default(draft) add 3
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	517 \|
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	518 o 4:ce341209337f@default(draft) add 4
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	519 \|
419 03672e955bc8 evolve: make graft wrapper handle --rev Patrick Mezard <patrick@mezard.eu> parents: 385 diff changeset	520 \| x 3:0e84df4912da@default(draft) add 3
418 18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	521 \| \|
419 03672e955bc8 evolve: make graft wrapper handle --rev Patrick Mezard <patrick@mezard.eu> parents: 385 diff changeset	522 \| x 2:db038628b9e5@default(draft) add 2
418 18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	523 \| \|
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	524 \| o 1:73d38bb17fd7@default(draft) add 1
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	525 \|/
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	526 o 0:8685c6d34325@default(draft) add 0
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	527
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 420 diff changeset	528 $ hg debugobsolete
1065 f355bbc124fc test: update test to new date formatting in debuobsolete output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1040 diff changeset	529 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (*) {'user': 'test'} (glob)
f355bbc124fc test: update test to new date formatting in debuobsolete output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1040 diff changeset	530 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (*) {'user': 'test'} (glob)
418 18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	531
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	532 Test graft --continue
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	533
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	534 $ hg up -qC 0
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	535 $ echo 2 > 1
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	536 $ hg ci -Am conflict 1
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	537 created new head
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	538 $ hg up -qC 6
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	539 $ hg graft -O 7
1188 0c879e986ce4 test: adapt to core change in graft and rebase Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	540 grafting 7:a5bfd90a2f29 "conflict" (tip)
418 18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	541 merging 1
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	542 warning: conflicts during merge.
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	543 merging 1 incomplete! (edit conflicts, then use 'hg resolve --mark')
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	544 abort: unresolved conflicts, can't continue
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	545 (use hg resolve and hg graft --continue)
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	546 [255]
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	547 $ hg log -r7 --template '{rev}:{node\|short} {obsolete}\n'
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	548 7:a5bfd90a2f29 stable
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	549 $ echo 3 > 1
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	550 $ hg resolve -m 1
1026 35adaf02b777 test: apply message changes introduced by mercurial 3.1 Pierre-Yves David <pierre-yves.david@fb.com> parents: 950 diff changeset	551 (no more unresolved files)
418 18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	552 $ hg graft --continue -O
1188 0c879e986ce4 test: adapt to core change in graft and rebase Pierre-Yves David <pierre-yves.david@fb.com> parents: 1185 diff changeset	553 grafting 7:a5bfd90a2f29 "conflict" (tip)
418 18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	554 $ glog --hidden
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	555 @ 8:920e58bb443b@default(draft) conflict
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	556 \|
420 b6163a85ddac merge Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 419 418 diff changeset	557 \| x 7:a5bfd90a2f29@default(draft) conflict
418 18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	558 \| \|
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	559 o \| 6:acb28cd497b7@default(draft) add 1
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	560 \| \|
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	561 o \| 5:0b9e50c35132@default(draft) add 3
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	562 \| \|
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	563 o \| 4:ce341209337f@default(draft) add 4
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	564 \|/
420 b6163a85ddac merge Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 419 418 diff changeset	565 \| x 3:0e84df4912da@default(draft) add 3
418 18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	566 \| \|
420 b6163a85ddac merge Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 419 418 diff changeset	567 \| x 2:db038628b9e5@default(draft) add 2
418 18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	568 \| \|
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	569 \| o 1:73d38bb17fd7@default(draft) add 1
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	570 \|/
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	571 o 0:8685c6d34325@default(draft) add 0
18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	572
441 d702f0d26c6a obsolete: remove debugsuccessors Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 420 diff changeset	573 $ hg debugobsolete
1065 f355bbc124fc test: update test to new date formatting in debuobsolete output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1040 diff changeset	574 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (*) {'user': 'test'} (glob)
f355bbc124fc test: update test to new date formatting in debuobsolete output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1040 diff changeset	575 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (*) {'user': 'test'} (glob)
f355bbc124fc test: update test to new date formatting in debuobsolete output Pierre-Yves David <pierre-yves.david@fb.com> parents: 1040 diff changeset	576 a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 (*) {'user': 'test'} (glob)
418 18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	577
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	578 Test touch
418 18a0d96ed559 evolve: graft --continue is optional, test Patrick Mezard <patrick@mezard.eu> parents: 414 diff changeset	579
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	580 $ glog
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	581 @ 8:920e58bb443b@default(draft) conflict
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	582 \|
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	583 o 6:acb28cd497b7@default(draft) add 1
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	584 \|
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	585 o 5:0b9e50c35132@default(draft) add 3
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	586 \|
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	587 o 4:ce341209337f@default(draft) add 4
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	588 \|
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	589 \| o 1:73d38bb17fd7@default(draft) add 1
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	590 \|/
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	591 o 0:8685c6d34325@default(draft) add 0
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	592
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	593 $ hg touch
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	594 $ glog
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	595 @ 9:*@default(draft) conflict (glob)
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	596 \|
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	597 o 6:acb28cd497b7@default(draft) add 1
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	598 \|
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	599 o 5:0b9e50c35132@default(draft) add 3
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	600 \|
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	601 o 4:ce341209337f@default(draft) add 4
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	602 \|
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	603 \| o 1:73d38bb17fd7@default(draft) add 1
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	604 \|/
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	605 o 0:8685c6d34325@default(draft) add 0
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	606
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	607 $ hg touch .
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	608 $ glog
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	609 @ 10:*@default(draft) conflict (glob)
481 4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	610 \|
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	611 o 6:acb28cd497b7@default(draft) add 1
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	612 \|
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	613 o 5:0b9e50c35132@default(draft) add 3
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	614 \|
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	615 o 4:ce341209337f@default(draft) add 4
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	616 \|
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	617 \| o 1:73d38bb17fd7@default(draft) add 1
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	618 \|/
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	619 o 0:8685c6d34325@default(draft) add 0
4e0f1aae8d24 evolve: touch command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 477 diff changeset	620
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	621
d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	622 Test fold
d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	623
549 b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	624 $ rm *.orig
561 897f6da2314e fold: handle the lack of revision to fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 553 diff changeset	625 $ hg fold
994 debf44fa91a2 fold: clarify message for empty revision set and abort instead (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 982 diff changeset	626 abort: no revisions specified
debf44fa91a2 fold: clarify message for empty revision set and abort instead (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 982 diff changeset	627 [255]
995 0f3a7efd6ee9 fold: emit error message when folding a single revision Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 994 diff changeset	628 $ hg fold .
0f3a7efd6ee9 fold: emit error message when folding a single revision Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 994 diff changeset	629 single revision specified, nothing to fold
561 897f6da2314e fold: handle the lack of revision to fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 553 diff changeset	630 [1]
998 85ec2a55fe7c fold: improve error messages for multiple heads and roots Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 997 diff changeset	631 $ hg fold 0::10 --rev 1 --exact
85ec2a55fe7c fold: improve error messages for multiple heads and roots Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 997 diff changeset	632 abort: cannot fold non-linear revisions (multiple heads given)
85ec2a55fe7c fold: improve error messages for multiple heads and roots Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 997 diff changeset	633 [255]
85ec2a55fe7c fold: improve error messages for multiple heads and roots Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 997 diff changeset	634 $ hg fold -r 4 -r 6 --exact
85ec2a55fe7c fold: improve error messages for multiple heads and roots Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 997 diff changeset	635 abort: cannot fold non-linear revisions (multiple roots given)
702 b5a85a8909d3 touch: properly handle touching multiple changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 699 diff changeset	636 [255]
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	637 $ hg fold 10 1
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	638 abort: cannot fold non-linear revisions
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	639 (given revisions are unrelated to parent of working directory)
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	640 [255]
997 f48cd2f48d14 fold: reword error message for public commits Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 996 diff changeset	641 $ hg phase --public 0
f48cd2f48d14 fold: reword error message for public commits Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 996 diff changeset	642 $ hg fold -r 0
f48cd2f48d14 fold: reword error message for public commits Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 996 diff changeset	643 abort: cannot fold public revisions
f48cd2f48d14 fold: reword error message for public commits Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 996 diff changeset	644 [255]
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	645 $ hg fold -r 5
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	646 3 changesets folded
549 b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	647 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	648 $ hg fold 6 # want to run hg fold 6
1133 8b3b0549a4b6 test: adapt to new hidden-changeset message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1128 diff changeset	649 abort: hidden revision '6'!
8b3b0549a4b6 test: adapt to new hidden-changeset message Pierre-Yves David <pierre-yves.david@fb.com> parents: 1128 diff changeset	650 (use --hidden to access hidden revisions)
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	651 [255]
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	652 $ hg log -r 11 --template '{desc}\n'
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	653 add 3
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	654
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	655
482 d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	656 add 1
d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	657
d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	658
d2531a747ff5 evolve: fold command Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 481 diff changeset	659 conflict
549 b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	660 $ hg debugrebuildstate
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	661 $ hg st
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	662
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	663 Test fold with wc parent is not the head of the folded revision
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	664
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	665 $ hg up 4
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	666 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	667 $ hg fold --rev 4::11 --user victor --exact
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	668 2 changesets folded
549 b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	669 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	670 $ glog
915 1ebe5c51919b fold: enable --date and --user options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 901 diff changeset	671 @ 12:d26d339c513f@default(draft) add 4
549 b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	672 \|
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	673 \| o 1:73d38bb17fd7@default(draft) add 1
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	674 \|/
997 f48cd2f48d14 fold: reword error message for public commits Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 996 diff changeset	675 o 0:8685c6d34325@default(public) add 0
549 b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	676
915 1ebe5c51919b fold: enable --date and --user options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 901 diff changeset	677 $ hg log --template '{rev}: {author}\n'
1ebe5c51919b fold: enable --date and --user options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 901 diff changeset	678 12: victor
1ebe5c51919b fold: enable --date and --user options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 901 diff changeset	679 1: test
1ebe5c51919b fold: enable --date and --user options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 901 diff changeset	680 0: test
549 b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	681 $ hg log -r 12 --template '{desc}\n'
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	682 add 4
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	683
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	684
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	685 add 3
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	686
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	687
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	688 add 1
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	689
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	690
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	691 conflict
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	692 $ hg debugrebuildstate
b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	693 $ hg st
483 b12ff7ef35b1 Introduction of olog as an alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 482 diff changeset	694
b12ff7ef35b1 Introduction of olog as an alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 482 diff changeset	695 Test olog
b12ff7ef35b1 Introduction of olog as an alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 482 diff changeset	696
b12ff7ef35b1 Introduction of olog as an alias Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 482 diff changeset	697 $ hg olog
549 b047e9417d96 Properly update after fold Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 492 diff changeset	698 4 : add 4 - test
996 b98dd5d3065c fold: overhaul handling of revisions with --rev (BC) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 995 diff changeset	699 11 : add 3 - test
901 4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	700
807 4dd1cda16fd0 evolve: add a debugobsstorestat command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 742 diff changeset	701 Test obsstore stat
4dd1cda16fd0 evolve: add a debugobsstorestat command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 742 diff changeset	702
4dd1cda16fd0 evolve: add a debugobsstorestat command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 742 diff changeset	703 $ hg debugobsstorestat
4dd1cda16fd0 evolve: add a debugobsstorestat command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 742 diff changeset	704 markers total: 10
4dd1cda16fd0 evolve: add a debugobsstorestat command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 742 diff changeset	705 for known precursors: 10
809 5d3ddede6ccf debugobsstorestat: add information about cluster Pierre-Yves David <pierre-yves.david@fb.com> parents: 807 diff changeset	706 with parents data: 0
807 4dd1cda16fd0 evolve: add a debugobsstorestat command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 742 diff changeset	707 markers with no successors: 0
4dd1cda16fd0 evolve: add a debugobsstorestat command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 742 diff changeset	708 1 successors: 10
4dd1cda16fd0 evolve: add a debugobsstorestat command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 742 diff changeset	709 2 successors: 0
4dd1cda16fd0 evolve: add a debugobsstorestat command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 742 diff changeset	710 more than 2 successors: 0
4dd1cda16fd0 evolve: add a debugobsstorestat command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 742 diff changeset	711 available keys:
4dd1cda16fd0 evolve: add a debugobsstorestat command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 742 diff changeset	712 user: 10
809 5d3ddede6ccf debugobsstorestat: add information about cluster Pierre-Yves David <pierre-yves.david@fb.com> parents: 807 diff changeset	713 disconnected clusters: 1
5d3ddede6ccf debugobsstorestat: add information about cluster Pierre-Yves David <pierre-yves.david@fb.com> parents: 807 diff changeset	714 any known node: 1
5d3ddede6ccf debugobsstorestat: add information about cluster Pierre-Yves David <pierre-yves.david@fb.com> parents: 807 diff changeset	715 smallest length: 10
5d3ddede6ccf debugobsstorestat: add information about cluster Pierre-Yves David <pierre-yves.david@fb.com> parents: 807 diff changeset	716 longer length: 10
5d3ddede6ccf debugobsstorestat: add information about cluster Pierre-Yves David <pierre-yves.david@fb.com> parents: 807 diff changeset	717 median length: 10
5d3ddede6ccf debugobsstorestat: add information about cluster Pierre-Yves David <pierre-yves.david@fb.com> parents: 807 diff changeset	718 mean length: 10
5d3ddede6ccf debugobsstorestat: add information about cluster Pierre-Yves David <pierre-yves.david@fb.com> parents: 807 diff changeset	719 using parents data: 1
5d3ddede6ccf debugobsstorestat: add information about cluster Pierre-Yves David <pierre-yves.david@fb.com> parents: 807 diff changeset	720 any known node: 1
5d3ddede6ccf debugobsstorestat: add information about cluster Pierre-Yves David <pierre-yves.david@fb.com> parents: 807 diff changeset	721 smallest length: 10
5d3ddede6ccf debugobsstorestat: add information about cluster Pierre-Yves David <pierre-yves.david@fb.com> parents: 807 diff changeset	722 longer length: 10
5d3ddede6ccf debugobsstorestat: add information about cluster Pierre-Yves David <pierre-yves.david@fb.com> parents: 807 diff changeset	723 median length: 10
5d3ddede6ccf debugobsstorestat: add information about cluster Pierre-Yves David <pierre-yves.david@fb.com> parents: 807 diff changeset	724 mean length: 10
907 c17ab719da56 merge with stable Pierre-Yves David <pierre-yves.david@fb.com> parents: 865 901 diff changeset	725
901 4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	726
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	727 Test evolving renames
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	728
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	729 $ hg up null
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	730 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	731 $ echo a > a
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	732 $ hg ci -Am a
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	733 adding a
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	734 created new head
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	735 $ echo b > b
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	736 $ hg ci -Am b
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	737 adding b
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	738 $ hg mv a c
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	739 $ hg ci -m c
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	740 $ hg kill .^
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	741 1 changesets pruned
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	742 1 new unstable changesets
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	743 $ hg stab --any
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	744 move:[15] c
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	745 atop:[13] a
1099 bac4e0bc9f6a evolve: write a status message when the working directory changes David Soria Parra <davidsp@fb.com> parents: 1067 diff changeset	746 working directory is now at 3742bde73477
901 4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	747 $ hg st -C --change=tip
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	748 A c
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	749 a
4f84b3307dc2 Fix preservation of rename information on evolve (#33) Julien Cristau <julien.cristau@logilab.fr> parents: 742 diff changeset	750 R a
933 e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	751
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	752 Test fold with commit messages
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	753
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	754 $ cd ../work
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	755 $ hg fold .^ --message "Folding with custom commit message"
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	756 2 changesets folded
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	757 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	758 $ glog
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1105 diff changeset	759 @ 16:d6239ff09c9f@default(draft) Folding with custom commit message
933 e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	760 \|
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1105 diff changeset	761 o 13:56ade053f46d@default(draft) dansk!
933 e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	762 \|
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1105 diff changeset	763 o 7:5c9c8d9c2e4e@default(public) another feature (child of ba0ec09b1bab)
933 e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	764 \|
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	765 o 6:ba0ec09b1bab@default(public) a nifty feature
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	766 \|
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	767 o 0:e55e0562ee93@default(public) base
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	768
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	769 $ cat > commit-message <<EOF
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	770 > A longer
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	771 > commit message
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	772 > EOF
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	773
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	774 $ hg fold .^ --logfile commit-message
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	775 2 changesets folded
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	776 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	777 $ hg qlog
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1105 diff changeset	778 17 - dba606655966 A longer
933 e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	779 commit message (draft)
1106 6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor Matt Harbison <matt_harbison@yahoo.com> parents: 1105 diff changeset	780 7 - 5c9c8d9c2e4e another feature (child of ba0ec09b1bab) (public)
933 e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	781 6 - ba0ec09b1bab a nifty feature (public)
e5baeb8fefec fold: add --message and --logfile options Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 915 diff changeset	782 0 - e55e0562ee93 base (public)
1141 ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	783
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	784 $ cd ..
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	785
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	786 Test branch preservation:
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	787 ===========================
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	788
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	789 $ hg init evolving-branch
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	790 $ cd evolving-branch
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	791 $ touch a
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	792 $ hg add a
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	793 $ hg ci -m 'a0'
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	794 $ echo 1 > a
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	795 $ hg ci -m 'a1'
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	796 $ echo 2 > a
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	797 $ hg ci -m 'a2'
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	798 $ echo 3 > a
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	799 $ hg ci -m 'a3'
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	800
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	801 $ hg log -G --template '{rev} [{branch}] {desc\|firstline}\n'
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	802 @ 3 [default] a3
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	803 \|
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	804 o 2 [default] a2
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	805 \|
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	806 o 1 [default] a1
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	807 \|
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	808 o 0 [default] a0
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	809
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	810
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	811 branch change propagated
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	812
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	813 $ hg up 'desc(a2)'
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	814 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	815 $ hg branch mybranch
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	816 marked working directory as branch mybranch
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	817 (branches are permanent and global, did you want a bookmark?)
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	818 $ hg amend
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	819 1 new unstable changesets
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	820
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	821 $ hg evolve
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	822 move:[3] a3
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	823 atop:[5] a2
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	824 working directory is now at 7c5649f73d11
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	825
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	826 $ hg log -G --template '{rev} [{branch}] {desc\|firstline}\n'
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	827 @ 6 [mybranch] a3
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	828 \|
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	829 o 5 [mybranch] a2
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	830 \|
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	831 o 1 [default] a1
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	832 \|
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	833 o 0 [default] a0
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	834
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	835
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	836 branch change preserved
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	837
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	838 $ hg up 'desc(a1)'
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	839 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	840 $ hg amend -m 'a1_'
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	841 2 new unstable changesets
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	842 $ hg evolve
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	843 move:[5] a2
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	844 atop:[7] a1_
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	845 working directory is now at 5406c5cfee42
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	846 $ hg evolve
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	847 move:[6] a3
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	848 atop:[8] a2
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	849 working directory is now at c7661e655801
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	850 $ hg log -G --template '{rev} [{branch}] {desc\|firstline}\n'
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	851 @ 9 [mybranch] a3
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	852 \|
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	853 o 8 [mybranch] a2
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	854 \|
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	855 o 7 [default] a1_
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	856 \|
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	857 o 0 [default] a0
ca17770d2ee9 evolve: preserve branch change Pierre-Yves David <pierre-yves.david@fb.com> parents: 1133 diff changeset	858
1157 5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434) Pierre-Yves David <pierre-yves.david@fb.com> parents: 1141 diff changeset	859
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434) Pierre-Yves David <pierre-yves.david@fb.com> parents: 1141 diff changeset	860 Evolve from the middle of a stack pick the right changesets.
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434) Pierre-Yves David <pierre-yves.david@fb.com> parents: 1141 diff changeset	861
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434) Pierre-Yves David <pierre-yves.david@fb.com> parents: 1141 diff changeset	862 $ hg up 7
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434) Pierre-Yves David <pierre-yves.david@fb.com> parents: 1141 diff changeset	863 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434) Pierre-Yves David <pierre-yves.david@fb.com> parents: 1141 diff changeset	864 $ hg ci --amend -m 'a1__'
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434) Pierre-Yves David <pierre-yves.david@fb.com> parents: 1141 diff changeset	865 2 new unstable changesets
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434) Pierre-Yves David <pierre-yves.david@fb.com> parents: 1141 diff changeset	866
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434) Pierre-Yves David <pierre-yves.david@fb.com> parents: 1141 diff changeset	867 $ hg up 8
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434) Pierre-Yves David <pierre-yves.david@fb.com> parents: 1141 diff changeset	868 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434) Pierre-Yves David <pierre-yves.david@fb.com> parents: 1141 diff changeset	869 $ hg evolve
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434) Pierre-Yves David <pierre-yves.david@fb.com> parents: 1141 diff changeset	870 nothing to evolve here
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434) Pierre-Yves David <pierre-yves.david@fb.com> parents: 1141 diff changeset	871 (2 troubled changesets, do you want --any ?)
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434) Pierre-Yves David <pierre-yves.david@fb.com> parents: 1141 diff changeset	872 [2]
1194 aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	873
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	874
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	875 Evolve disables active bookmarks.
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	876
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	877 $ hg up 10
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	878 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	879 $ hg bookmark testbookmark
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	880 $ ls .hg/bookmarks*
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	881 .hg/bookmarks
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	882 .hg/bookmarks.current
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	883 $ hg evolve
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	884 move:[8] a2
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	885 atop:[10] a1__
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	886 (leaving bookmark testbookmark)
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	887 working directory is now at f37ed7a60f43
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	888 $ ls .hg/bookmarks*
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432) Tyrone Nicholas <tnicholas@fb.com> parents: 1185 diff changeset	889 .hg/bookmarks
1325 1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	890
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	891 Possibility to select what trouble to solve first, asking for bumped before
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	892 divergent
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	893 $ hg up 10
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	894 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	895 $ hg revert -r 11 --all
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	896 reverting a
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	897 $ hg log -G --template '{rev} [{branch}] {desc\|firstline}\n'
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	898 o 11 [mybranch] a2
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	899 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	900 @ 10 [default] a1__
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	901 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	902 \| o 9 [mybranch] a3
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	903 \| \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	904 \| x 8 [mybranch] a2
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	905 \| \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	906 \| x 7 [default] a1_
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	907 \|/
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	908 o 0 [default] a0
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	909
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	910 $ echo "hello world" > newfile
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	911 $ hg add newfile
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	912 $ hg commit -m "add new file bumped" -o 11
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	913 $ hg phase --public --hidden 11
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	914 1 new bumped changesets
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	915 $ hg glog
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	916 @ 12 : add new file bumped - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	917 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	918 \| o 11 : a2 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	919 \|/
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	920 o 10 testbookmark: a1__ - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	921 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	922 \| o 9 : a3 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	923 \| \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	924 \| x 8 : a2 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	925 \| \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	926 \| x 7 : a1_ - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	927 \|/
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	928 o 0 : a0 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	929
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	930
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	931 Now we have a bumped and an unstable changeset, we solve the bumped first
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	932 normally the unstable changeset would be solve first
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	933
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	934 $ hg glog
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	935 @ 12 : add new file bumped - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	936 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	937 \| o 11 : a2 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	938 \|/
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	939 o 10 testbookmark: a1__ - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	940 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	941 \| o 9 : a3 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	942 \| \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	943 \| x 8 : a2 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	944 \| \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	945 \| x 7 : a1_ - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	946 \|/
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	947 o 0 : a0 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	948
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	949 $ hg evolve -r 12
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	950 recreate:[12] add new file bumped
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	951 atop:[11] a2
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	952 computing new diff
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	953 committed as d66b1e328488
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	954 working directory is now at d66b1e328488
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	955 $ hg evolve --any
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	956 move:[9] a3
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	957 atop:[13] bumped update to f37ed7a60f43:
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	958 working directory is now at 7d2ce5f38f9b
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	959 Check that we can resolve troubles in a revset with more than one commit
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	960 $ hg up 14 -C
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	961 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	962 $ mkcommit gg
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	963 $ hg up 14
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	964 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	965 $ mkcommit gh
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	966 created new head
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	967 $ hg up 14
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	968 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	969 $ echo "newline\nnewline" >> a
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	970 $ hg glog
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	971 o 16 : add gh - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	972 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	973 \| o 15 : add gg - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	974 \|/
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	975 @ 14 : a3 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	976 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	977 o 13 : bumped update to f37ed7a60f43: - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	978 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	979 o 11 : a2 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	980 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	981 o 10 testbookmark: a1__ - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	982 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	983 o 0 : a0 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	984
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	985 $ hg amend
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	986 2 new unstable changesets
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	987 $ hg glog
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	988 @ 18 : a3 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	989 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	990 \| o 16 : add gh - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	991 \| \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	992 \| \| o 15 : add gg - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	993 \| \|/
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	994 \| x 14 : a3 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	995 \|/
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	996 o 13 : bumped update to f37ed7a60f43: - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	997 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	998 o 11 : a2 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	999 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1000 o 10 testbookmark: a1__ - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1001 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1002 o 0 : a0 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1003
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1004 $ hg evolve --rev "14::"
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1005 move:[16] add gh
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1006 atop:[18] a3
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1007 move:[15] add gg
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1008 atop:[18] a3
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1009 working directory is now at 10ffdd7e3cc9
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1010 $ hg glog
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1011 @ 20 : add gg - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1012 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1013 \| o 19 : add gh - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1014 \|/
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1015 o 18 : a3 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1016 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1017 o 13 : bumped update to f37ed7a60f43: - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1018 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1019 o 11 : a2 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1020 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1021 o 10 testbookmark: a1__ - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1022 \|
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1023 o 0 : a0 - test
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1024
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1025
1fe3da0b4601 evolve: add --rev option to the evolve command Laurent Charignon <lcharignon@fb.com> parents: 1283 diff changeset	1026

Mercurial > evolve

annotate tests/test-evolve.t @ 1325:1fe3da0b4601