Mercurial > hg
annotate CONTRIBUTORS @ 16509:eab9119c5dee stable
rebase: skip resolved but emptied revisions
When rebasing, if a conflict occurs and is resolved in a way the rebased
revision becomes empty, it is not skipped, unlike revisions being emptied
without conflicts.
The reason is:
- File 'x' is merged and resolved, merge.update() marks it as 'm' in the
dirstate.
- rebase.concludenode() calls localrepo.commit(), which calls
localrepo.status() which calls dirstate.status(). 'x' shows up as 'm' and is
unconditionnally added to the modified files list, instead of being checked
again.
- localrepo.commit() detects 'x' as changed an create a new revision where only
the manifest parents and linkrev differ.
Marking 'x' as modified without checking it makes sense for regular merges. But
in rebase case, the merge looks normal but the second parent is usually
discarded. When this happens, 'm' files in dirstate are a bit irrelevant and
should be considered 'n' possibly dirty instead. That is what the current patch
does.
Another approach, maybe more efficient, would be to pass another flag to
merge.update() saying the 'branchmerge' is a bit of a lie and recordupdate()
should call dirstate.normallookup() instead of merge().
It is also tempting to add this logic to dirstate.setparents(), moving from two
to one parent is what invalidates the 'm' markers. But this is a far bigger
change to make.
v2: succumb to the temptation and move the logic in dirstate.setparents(). mpm
suggested trying _filecommit() first but it is called by commitctx() which
knows nothing about the dirstate and comes too late into the game. A second
approach was to rewrite the 'm' state into 'n' on the fly in dirstate.status()
which failed for graft in the following case:
$ hg init repo
$ cd repo
$ echo a > a
$ hg ci -qAm0
$ echo a >> a
$ hg ci -m1
$ hg up 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg mv a b
$ echo c > b
$ hg ci -m2
created new head
$ hg graft 1 --tool internal:local
grafting revision 1
$ hg --config extensions.graphlog= glog --template '{rev} {desc|firstline}\n'
@ 3 1
|
o 2 2
|
| o 1 1
|/
o 0 0
$ hg log -r 3 --debug --patch --git --copies
changeset: 3:19cd7d1417952af13161b94c32e901769104560c
tag: tip
phase: draft
parent: 2:b5c505595c9e9a12d5dd457919c143e05fc16fb8
parent: -1:0000000000000000000000000000000000000000
manifest: 3:3d27ce8d02241aa59b60804805edf103c5c0cda4
user: test
date: Thu Jan 01 00:00:00 1970 +0000
extra: branch=default
extra: source=a03df74c41413a75c0a42997fc36c2de97b26658
description:
1
Here, revision 3 is created because there is a copy record for 'b' in the
dirstate and thus 'b' is considered modified. But this information is discarded
at commit time since 'b' content is unchanged. I do not know if discarding this
information is correct or not, but at this time we cannot represent it anyway.
This patch therefore implements the last solution of moving the logic into
dirstate.setparents(). It does not sound crazy as 'm' files makes no sense with
only one parent. It also makes dirstate.merge() calls .lookupnormal() if there
is one parent, to preserve the invariant.
I am a bit concerned about introducing this kind of stateful behaviour to
existing code which historically treated setparents() as a basic setter without
side-effects. And doing that during the code freeze.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Sun, 22 Apr 2012 20:06:36 +0200 |
parents | c29efd272395 |
children |
rev | line source |
---|---|
5514
c29efd272395
Add note to CONTRIBUTORS file
Matt Mackall <mpm@selenic.com>
parents:
2947
diff
changeset
|
1 [This file is here for historical purposes, all recent contributors |
c29efd272395
Add note to CONTRIBUTORS file
Matt Mackall <mpm@selenic.com>
parents:
2947
diff
changeset
|
2 should appear in the changelog directly] |
c29efd272395
Add note to CONTRIBUTORS file
Matt Mackall <mpm@selenic.com>
parents:
2947
diff
changeset
|
3 |
c29efd272395
Add note to CONTRIBUTORS file
Matt Mackall <mpm@selenic.com>
parents:
2947
diff
changeset
|
4 Andrea Arcangeli <andrea at suse.de> |
519 | 5 Thomas Arendsen Hein <thomas at intevation.de> |
6 Goffredo Baroncelli <kreijack at libero.it> | |
756
5d79dfa5e98f
Added new code contributors, fixed Vincent's name, added hint on encoding.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
594
diff
changeset
|
7 Muli Ben-Yehuda <mulix at mulix.org> |
5d79dfa5e98f
Added new code contributors, fixed Vincent's name, added hint on encoding.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
594
diff
changeset
|
8 Mikael Berthe <mikael at lilotux.net> |
1450 | 9 Benoit Boissinot <bboissin at gmail.com> |
2947
2d865068f72e
Add self to contributors
Brendan Cully <brendan@kublai.com>
parents:
2162
diff
changeset
|
10 Brendan Cully <brendan at kublai.com> |
519 | 11 Vincent Danjean <vdanjean.ml at free.fr> |
12 Jake Edge <jake at edge2.net> | |
13 Michael Fetterman <michael.fetterman at intel.com> | |
14 Edouard Gomez <ed.gomez at free.fr> | |
1231 | 15 Eric Hopper <hopper at omnifarious.org> |
756
5d79dfa5e98f
Added new code contributors, fixed Vincent's name, added hint on encoding.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
594
diff
changeset
|
16 Alecs King <alecsk at gmail.com> |
1310
7e8a55c9ee5c
Updated CONTRIBUTORS.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1231
diff
changeset
|
17 Volker Kleinfeld <Volker.Kleinfeld at gmx.de> |
519 | 18 Vadim Lebedev <vadim at mbdsys.com> |
19 Christopher Li <hg at chrisli.org> | |
20 Chris Mason <mason at suse.com> | |
2162
dac432a521d8
Add self to CONTRIBUTORS
Colin McMillen <mcmillen@cs.cmu.edu>
parents:
2120
diff
changeset
|
21 Colin McMillen <mcmillen at cs.cmu.edu> |
1080
253072f39205
Updated list of contributors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
896
diff
changeset
|
22 Wojciech Milkowski <wmilkowski at interia.pl> |
756
5d79dfa5e98f
Added new code contributors, fixed Vincent's name, added hint on encoding.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
594
diff
changeset
|
23 Chad Netzer <chad.netzer at gmail.com> |
519 | 24 Bryan O'Sullivan <bos at serpentine.com> |
756
5d79dfa5e98f
Added new code contributors, fixed Vincent's name, added hint on encoding.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
594
diff
changeset
|
25 Vicent SeguĂ Pascual <vseguip at gmail.com> |
5d79dfa5e98f
Added new code contributors, fixed Vincent's name, added hint on encoding.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
594
diff
changeset
|
26 Sean Perry <shaleh at speakeasy.net> |
594 | 27 Nguyen Anh Quynh <aquynh at gmail.com> |
1310
7e8a55c9ee5c
Updated CONTRIBUTORS.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1231
diff
changeset
|
28 Ollivier Robert <roberto at keltia.freenix.fr> |
2120
c0994047c5ff
Added my name to the contributors list.
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
1450
diff
changeset
|
29 Alexander Schremmer <alex at alexanderweb.de> |
519 | 30 Arun Sharma <arun at sharma-home.net> |
1231 | 31 Josef "Jeff" Sipek <jeffpc at optonline.net> |
1310
7e8a55c9ee5c
Updated CONTRIBUTORS.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1231
diff
changeset
|
32 Kevin Smith <yarcs at qualitycode.com> |
1231 | 33 TK Soh <teekaysoh at yahoo.com> |
519 | 34 Radoslaw Szkodzinski <astralstorm at gorzow.mm.pl> |
851
73a432c8040a
Added Samuel Tardieu to contributors list.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
760
diff
changeset
|
35 Samuel Tardieu <sam at rfc1149.net> |
519 | 36 K Thananchayan <thananck at yahoo.com> |
37 Andrew Thompson <andrewkt at aktzero.com> | |
38 Michael S. Tsirkin <mst at mellanox.co.il> | |
39 Rafael Villar Burke <pachi at mmn-arquitectos.com> | |
855
a107c64c76be
Added Tristan Wibberley to contributors.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
851
diff
changeset
|
40 Tristan Wibberley <tristan at wibberley.org> |
756
5d79dfa5e98f
Added new code contributors, fixed Vincent's name, added hint on encoding.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
594
diff
changeset
|
41 Mark Williamson <mark.williamson at cl.cam.ac.uk> |