Patrick Mezard <patrick@mezard.eu> [Thu, 21 Jun 2012 18:00:32 +0200] rev 296
test-evolve: extend output and exhibit an amend bug
The extended section shows the parent revision stabilizing itself on
another revision, without --any. In theory, only descendants of the
parent predecessors or of its descendants should be stabilized, and be
stabilized in parent subtree. Unfortunately, stabilize implementation
correctly picks the changesets to stabilize but not their target.
This problem is aggravated by amend registering too many obsolete
markers which prevents the stabilize selection heuristic to prune
several changesets.
Patrick Mezard <patrick@mezard.eu> [Thu, 21 Jun 2012 17:33:02 +0200] rev 295
evolve: remove --change . == --change .^ crazyness
Patrick Mezard <patrick@mezard.eu> [Thu, 21 Jun 2012 16:23:42 +0200] rev 294
evolve: use explicit phase constants
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 18:04:50 +0200] rev 293
[doc] update readme
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 16:19:21 +0200] rev 292
[doc] have people update on stable after cloning
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 16:07:20 +0200] rev 291
merge with fix
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 16:07:01 +0200] rev 290
merge with fix
David Douard <david.douard@logilab.fr> [Mon, 11 Jun 2012 11:59:08 +0200] rev 289
[qsync] fix: 'newerversion' expect node id, not hexid
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 15:57:57 +0200] rev 288
merge back with stable tag
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 15:57:35 +0200] rev 287
Added tag 0.2.0 for changeset d3f20770b86a
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 15:57:28 +0200] rev 286
Merge with Patrick improvement
Patrick Mezard <patrick@mezard.eu> [Wed, 20 Jun 2012 14:43:20 +0200] rev 285
obsolete: do not obsolete rebase --detach nullmerge revs
Rebase state contains the changesets to rebase as well as 'nullmerge'
entries used drive the merge strategy. These nullmerge were not rebased
and should be ignored, and certainly not be marked obsolete.
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 17:57:54 +0200] rev 284
evolve: fix relocate() with removed revision
relocate() was not handling the case where the rebased revision was
discarded and was raising when trying to update the phase of None.
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 17:58:49 +0200] rev 283
test-obsolete-rebase.t: test --abort and --continue
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 18:05:23 +0200] rev 282
obsolete: handle rebase --collapse
Recording obsolete in concludenode() did not work for --collapse because
only the first revision was passed to the call. The new strategy is to
track the rebase state in defineparents() and concludenode() and to
create markers only after a successful non-abort call. In theory, this
should also fix --continue/--abort cases.
The change in test-stabilize-order.t comes from concludenode() no longer
creating obsolete marker. stabilize command was actually duplicating
markers, once in concludenode(), once explicitely.
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 17:05:39 +0200] rev 281
test-stabilize-order.t: trace obsolete markers
Will prevent breakage in rebase.concludenode() overriding.
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 14:02:12 +0200] rev 280
test-obsolete-rebase.t: move --keep test from test-obsolete.t
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 18:02:34 +0200] rev 279
obsolete: handle rebase removing empty changesets
The new revision identifier returned by concludenode() was None and was
not correctly translated to nullid.
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 10:24:47 +0200] rev 278
obsolete: add or fix debug commands help
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 10:20:09 +0200] rev 277
obsolete: do not duplicate command help
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 10:17:02 +0200] rev 276
obsolete: use new-style command registration
Patrick Mezard <patrick@mezard.eu> [Wed, 20 Jun 2012 15:42:01 +0200] rev 275
obsolete: make rebase abort with --keep
obsolete modifies rebase to mark rebased changesets obsolete instead of
stripping them, which makes --keep irrelevant.
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 09:23:50 +0200] rev 274
obsolete: fix rebase wrapping
ui and repo arguments were swapped which made --keep calls traceback.
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 10:02:32 +0200] rev 273
obsolete: add debugsuccessors command
It dumps obsolete changesets and their successors.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 18 Jun 2012 12:11:06 +0200] rev 272
evolve: add alias for kill and stabilize
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 15:30:55 +0200] rev 271
merge with 0.1.0 tag
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 20 Jun 2012 15:28:51 +0200] rev 270
Added tag 0.1.0 for changeset 6c6bb7a23bb5
Patrick Mezard <patrick@mezard.eu> [Wed, 13 Jun 2012 18:28:10 +0200] rev 269
stabilize: improve unstable selection heuristic
Without argument, stabilize was picking the first in:
"unstable() and ((suspended() or obsancestors(::.))::)"
which usually returned the "oldest" unstable revision in parent
predecessors descendants. This revision is interesting because it
usually gives "soft" merges but rebasing it left the working directory
on a remote branch, which was very confusing.
The new heuristic picks an unstable changeset which can be rebased on
top of the parent revision, or on top of one of its descendants
(selected in revision order). This has the advantage of selecting a
revision which can be rebased on the current subtree, and leave the
working directory in a more convenient location.
Patrick Mezard <patrick@mezard.eu> [Tue, 12 Jun 2012 15:33:23 +0200] rev 268
amend: remove useless repo.changelog alias
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 18 Jun 2012 17:15:04 +0200] rev 267
README: some more changes
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 18 Jun 2012 17:12:11 +0200] rev 266
merge with Arne changes
Patrick Mezard <patrick@mezard.eu> [Tue, 12 Jun 2012 13:28:39 +0200] rev 265
amend: do not traceback on no-ops
If rewrite() generated changeset happened to be an existing one, the
call would traceback when trying to obsolete the changeset with itself.
Instead, leave gracefully, marking any intermediate changeset extinct.
Patrick Mezard <patrick@mezard.eu> [Tue, 12 Jun 2012 11:53:02 +0200] rev 264
amend: do not rely on revsingle() default for --change
Patrick Mezard <patrick@mezard.eu> [Tue, 12 Jun 2012 11:14:02 +0200] rev 263
amend: drop --branches, pick it from working directory
The amended changeset branch was picked either from --branch or from the
first parent, but the actual working directory branch was ignored. The
behaviour is changed so the amended revision branch is picked from the
intermediate revision, which branch comes from the usual working
directory rules. --branch is thus replaced by "hg branch".
Patrick Mezard <patrick@mezard.eu> [Tue, 12 Jun 2012 11:08:27 +0200] rev 262
.hgignore: add .rej/.err/.orig and emacs tmp files
Arne Babenhauserheide <bab@draketo.de> [Mon, 18 Jun 2012 14:35:49 +0200] rev 261
added “pull here is OK, too” to the README.
Patrick Mezard <patrick@mezard.eu> [Wed, 06 Jun 2012 16:13:44 +0200] rev 260
evolve: fix stabilize --any short option
It was displayed as --A instead of -A.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 05 Jun 2012 22:24:24 +0200] rev 259
tutorial: zsh fix
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 05 Jun 2012 22:13:59 +0200] rev 258
Fix amend and relocate who picked phases data after extinct wher made secret
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 05 Jun 2012 21:52:44 +0200] rev 257
zsh does not like "`" in << EOF
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 05 Jun 2012 21:42:12 +0200] rev 256
readlinks does not do what we wnat on BSD
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 06 Jun 2012 01:06:11 +0200] rev 255
evolve: update rebase usage to match 2.3
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 05 Jun 2012 20:43:39 +0200] rev 254
obsolete: fix error in cache invalidation
Alain Leufroy <alain.leufroy@logilab.fr> [Tue, 29 May 2012 11:15:19 +0200] rev 253
[obsolete] fix new api: be more flexible on rebase's buildstate signature
Introduced by `d1afbf03e69a@mercurial <http://selenic.com/repo/hg/rev/d1afbf03e69a>`_
Alain Leufroy <alain.leufroy@logilab.fr> [Tue, 29 May 2012 10:27:33 +0200] rev 252
[obsolete] fix new api: use the new phase cache api
Introduced by `b6081c2c4647@mercurial <http://selenic.com/repo/hg/rev/b6081c2c4647>`_
David Douard <david.douard@logilab.fr> [Wed, 30 May 2012 14:17:33 +0200] rev 251
[qsync] abort properly of a patches repository does not exists
Damien Garaud <damien.garaud@logilab.fr> [Fri, 25 May 2012 19:51:32 +0200] rev 250
[doc] Specify that tuto hg configuration is used for testing.
David Douard <david.douard@logilab.fr> [Thu, 24 May 2012 00:24:40 +0200] rev 249
qsync: fix mq commit message generation
A CR was missing when both applied and ready to review patches are generated
during a single qsync.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 22 May 2012 10:35:04 +0200] rev 248
[doc] changes location of repo
We now have a "stable" repo on bitbucket and a dev repo on logilab hg lab.
Pierre-Yves.David@ens-lyon.org [Sat, 12 May 2012 18:50:11 +0200] rev 247
change version definition
Pierre-Yves.David@ens-lyon.org [Sat, 12 May 2012 00:12:18 +0200] rev 246
doc: idea about OnDisk Storage
Pierre-Yves.David@ens-lyon.org [Fri, 11 May 2012 23:13:14 +0200] rev 245
doc: add the RoadMap
Pierre-Yves.David@ens-lyon.org [Fri, 11 May 2012 16:43:59 +0200] rev 244
[doc] add Question and Answer about Obsolet Marker Implementation
Pierre-Yves.David@ens-lyon.org [Fri, 11 May 2012 11:52:15 +0200] rev 243
fix typo in file name
Pierre-Yves.David@ens-lyon.org [Fri, 11 May 2012 11:42:59 +0200] rev 242
[doc] change doc generation directory
Pierre-Yves.David@ens-lyon.org [Fri, 11 May 2012 11:45:00 +0200] rev 241
[doc] add good practice section
Pierre-Yves.David@ens-lyon.org [Fri, 11 May 2012 11:44:39 +0200] rev 240
[doc] fix unstable code block
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 09 May 2012 23:45:57 +0200] rev 239
[readme] fix stupid typo
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 09 May 2012 23:44:39 +0200] rev 238
more read me update
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 09 May 2012 23:13:07 +0200] rev 237
update README