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
Pierre-Yves.David@ens-lyon.org [Wed, 09 May 2012 23:00:00 +0200] rev 236
[doc] fix tutorial warning
Pierre-Yves.David@ens-lyon.org [Wed, 09 May 2012 22:55:58 +0200] rev 235
[doc] add `.t` to `.rst` converteur
Update make file accordingly.
Pierre-Yves.David@ens-lyon.org [Wed, 09 May 2012 22:29:16 +0200] rev 234
[doc] fix bad include
Pierre-Yves.David@ens-lyon.org [Wed, 09 May 2012 22:28:52 +0200] rev 233
[doc] add a simple make file
Benoit Allard <benoit@aeteurope.nl> [Wed, 09 May 2012 19:02:35 +0200] rev 232
docs: proof-read and review
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 09 May 2012 18:52:57 +0200] rev 231
restore unstability content
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 09 May 2012 16:41:38 +0200] rev 230
less verbose table
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 09 May 2012 16:39:35 +0200] rev 229
[doc] update tutorial text.
Nicolas Chauvat <nicolas.chauvat@logilab.fr> [Wed, 09 May 2012 14:24:56 +0200] rev 228
proof-read documentation and docstrings
Pierre-Yves.David@ens-lyon.org [Wed, 09 May 2012 13:08:46 +0200] rev 227
doc: several update and review.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 09 May 2012 12:43:45 +0200] rev 226
obsolete: export pretty printed json
Will help unavoidable hand fixing.
Pierre-Yves.David@ens-lyon.org [Tue, 08 May 2012 19:52:50 +0200] rev 225
accept test change (not very happy about it)
Pierre-Yves.David@ens-lyon.org [Tue, 08 May 2012 20:50:43 +0200] rev 224
new obsolete store
The new formats allows multiple "new" changeset and various meta-data.
Forcing extinct to secret phase happen now on an irregular basis
A command exist to migrate to the new format
Pierre-Yves.David@ens-lyon.org [Sun, 06 May 2012 03:27:45 +0200] rev 223
enable.sh: enable rebase because evolve need it
Pierre-Yves.David@ens-lyon.org [Sun, 06 May 2012 03:27:21 +0200] rev 222
ignore .pyc files
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 04 May 2012 18:16:41 +0200] rev 221
doc: unstability principle
David Douard <david.douard@logilab.fr> [Fri, 04 May 2012 14:33:35 +0200] rev 220
qsync: support for synchronisation with applied patches from outer space and more
:more:
- also add some tests
- kill OLDBRANCHNAME
- several minor cleaning
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 May 2012 14:08:21 +0200] rev 219
evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 26 Apr 2012 16:49:15 +0200] rev 218
obsolete: do no complain when push create a new head but obsolete an old one.
Do not read the code or your eyes will burn.
The (+1 heads) message still appear (see mercurial issue 3394).
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 24 Apr 2012 16:30:58 +0200] rev 217
obsolete: refuse to push unstable changeset without -f
We do not alter phase of suspended and unstable changeset anymore. But push
refuse to push them without force.
The extinct part of the history stay secret for simplicity shake.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 24 Apr 2012 15:57:48 +0200] rev 216
qsync: add a warning file in qsync changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Apr 2012 18:11:52 +0200] rev 215
obsolete: fix changelog reload
This changelog was not properly reloaded. This leaded to bug with rollback and
strip.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 25 Apr 2012 18:15:56 +0200] rev 214
obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 24 Apr 2012 15:56:31 +0200] rev 213
obsolete: add an extinct property on context
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 24 Apr 2012 15:58:19 +0200] rev 212
obsolete: to not overwrite cancopy
This does not bring anything and this confuse verify.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 23 Apr 2012 18:54:17 +0200] rev 211
evolve: issue the "%i new unstable changeset" in more place
most command able to create unstability now issue the warning
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 23 Apr 2012 18:53:26 +0200] rev 210
obsolete: blindly obsolete unstability cache when changeset are added
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 23 Apr 2012 17:25:36 +0200] rev 209
tutorial: make it pass again
More work is needed but the tutorial work as a functionnal test.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 23 Apr 2012 17:24:34 +0200] rev 208
docs: fix broken alias for qseries
template for description in `{desc}` not `{description}`
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 23 Apr 2012 15:14:51 +0200] rev 207
fix enable.sh script
it was printing the mercurial version in to HGRC file
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 23 Apr 2012 15:03:33 +0200] rev 206
test: graphlog honor --hidden honor in 2.2
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 23 Apr 2012 14:54:06 +0200] rev 205
obsolete: fix rollback wrapper for 2.2-rc
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 20 Apr 2012 17:12:38 +0200] rev 204
2.2 compat: nodemap.get take a single argument now.
Alain Leufroy <alain.leufroy@logilab.fr> [Mon, 16 Apr 2012 10:51:40 +0200] rev 203
[obsolete] add supprt for futur Hg 2.2
Alain Leufroy <alain.leufroy@logilab.fr> [Mon, 16 Apr 2012 10:03:16 +0200] rev 202
[obsolete] simplify by using the Hg 2.1 api
David Douard <david.douard@logilab.fr> [Tue, 03 Apr 2012 17:47:15 +0200] rev 201
qsync: display short node repr on error
David Douard <david.douard@logilab.fr> [Mon, 02 Apr 2012 17:40:26 +0200] rev 200
FAQ: add en entry about rebasing after a pull
David Douard <david.douard@logilab.fr> [Mon, 02 Apr 2012 17:40:48 +0200] rev 199
FAQ: typos
David Douard <david.douard@logilab.fr> [Mon, 02 Apr 2012 17:19:48 +0200] rev 198
FAQ: small typo
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 02 Apr 2012 14:43:41 +0200] rev 197
stronger try except for store cache
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 28 Mar 2012 21:13:46 +0200] rev 196
amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 29 Mar 2012 17:18:43 +0200] rev 195
ignore merge in qsync
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 28 Mar 2012 14:09:01 +0200] rev 194
add a known issu
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 28 Mar 2012 13:48:56 +0200] rev 193
merge arne change
Arne Babenhauserheide <bab@draketo.de> [Wed, 28 Mar 2012 12:50:42 +0200] rev 192
docs: Merged obs-concept changes by hand.
Arne Babenhauserheide <bab@draketo.de> [Wed, 28 Mar 2012 11:35:53 +0200] rev 191
Backed out backout changeset f047cd4f1235
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 28 Mar 2012 11:55:59 +0200] rev 190
fix qsync-enable.sh
extension name is qsync not obsolete (terrible terrible trouble)
Aurelien Campeas <aurelien.campeas@logilab.fr> [Wed, 28 Mar 2012 11:18:50 +0200] rev 189
follow-up on evolve-collaboration
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 28 Mar 2012 11:24:30 +0200] rev 188
add split example
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 28 Mar 2012 11:19:07 +0200] rev 187
doc: some minor fixes
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 28 Mar 2012 11:07:53 +0200] rev 186
merge with arne change
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 28 Mar 2012 11:07:15 +0200] rev 185
merge with backout
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 28 Mar 2012 11:07:02 +0200] rev 184
backout obs-concept.rst changes
too much conflict with changes in another branch
Arne Babenhauserheide <bab@draketo.de> [Tue, 27 Mar 2012 20:03:59 +0200] rev 183
docs: polish for glossary
Arne Babenhauserheide <bab@draketo.de> [Tue, 27 Mar 2012 19:59:47 +0200] rev 182
docs: polishing of from-mq.
Arne Babenhauserheide <bab@draketo.de> [Tue, 27 Mar 2012 19:46:54 +0200] rev 181
docs: fix typos in evolve collaboration.
Arne Babenhauserheide <bab@draketo.de> [Tue, 27 Mar 2012 19:42:09 +0200] rev 180
docs: added a question: split changesets?
Arne Babenhauserheide <bab@draketo.de> [Tue, 27 Mar 2012 19:41:52 +0200] rev 179
docs: fix typos in the FAQ
Arne Babenhauserheide <bab@draketo.de> [Tue, 27 Mar 2012 19:18:44 +0200] rev 178
evolve: logopts was called logopt.
Arne Babenhauserheide <bab@draketo.de> [Tue, 27 Mar 2012 19:14:37 +0200] rev 177
docs: typo
Arne Babenhauserheide <bab@draketo.de> [Tue, 27 Mar 2012 19:07:20 +0200] rev 176
docs: polishing of obs-concept.rst
Arne Babenhauserheide <bab@draketo.de> [Tue, 27 Mar 2012 18:35:18 +0200] rev 175
docs: some fixes on the index and the first half of the obsolete concepts.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 27 Mar 2012 17:51:09 +0200] rev 174
merge
Aurelien Campeas <aurelien.campeas@logilab.fr> [Tue, 27 Mar 2012 17:49:34 +0200] rev 173
many fixes
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 27 Mar 2012 17:39:34 +0200] rev 172
doc: replace ">" by ">>" (oups)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 27 Mar 2012 17:38:55 +0200] rev 171
doc: add reference to qsync
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 27 Mar 2012 17:29:16 +0200] rev 170
merge with auc improvement
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 27 Mar 2012 17:28:47 +0200] rev 169
auc improvement of the doc
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 27 Mar 2012 17:16:30 +0200] rev 168
add more canveas
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 27 Mar 2012 16:55:47 +0200] rev 167
add auc user story
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 27 Mar 2012 16:50:14 +0200] rev 166
big doc update
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 26 Mar 2012 18:24:39 +0200] rev 165
title reorganisation
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 26 Mar 2012 18:22:09 +0200] rev 164
improved intro about evolve
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Mar 2012 19:09:24 +0100] rev 163
more doc update
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 21 Mar 2012 12:11:43 +0100] rev 162
add svg for schema
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Mar 2012 19:26:55 +0100] rev 161
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Mar 2012 11:57:03 +0100] rev 160
mercurial 2.1.2 compat
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Mar 2012 17:53:51 +0100] rev 159
really add qsync enable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Mar 2012 17:04:49 +0100] rev 158
this is an FAQ not a tutorial
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Mar 2012 17:04:05 +0100] rev 157
add version info
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Mar 2012 16:58:00 +0100] rev 156
some more doc update
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Mar 2012 16:23:02 +0100] rev 155
add a qsync-enable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Mar 2012 16:19:59 +0100] rev 154
use cat in enable.sh
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Mar 2012 16:11:57 +0100] rev 153
add qsync extension to mutable history
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Mar 2012 15:18:29 +0100] rev 152
very cruse evolve tutorial
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Mar 2012 15:18:10 +0100] rev 151
evolve: improve graft handling of -O
we now resolve changeset reference before graft
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Mar 2012 15:10:53 +0100] rev 150
obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Mar 2012 11:02:11 +0100] rev 149
import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Mar 2012 10:39:07 +0100] rev 148
obsolete: define an unstable property on context
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Mar 2012 10:38:38 +0100] rev 147
kill: properly get revision pointed by --new
Previously the raw value on --new ended in the obsolete file.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 13 Mar 2012 12:00:40 +0100] rev 146
stabilize: proper --quiet behavior
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 08 Mar 2012 14:35:57 +0100] rev 145
stabilize: stabilize my topological branch only
if not stated otherwize.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 08 Mar 2012 14:15:53 +0100] rev 144
Add a bosancestors revset
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 08 Mar 2012 13:56:27 +0100] rev 143
add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 08 Mar 2012 12:21:01 +0100] rev 142
overwrite user not date
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 29 Feb 2012 14:49:52 +0100] rev 141
remove useless hidden related stuff in amend
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 29 Feb 2012 14:42:30 +0100] rev 140
add user to the list of option prevent the "no change found" message to show up
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 17 Feb 2012 19:54:42 +0100] rev 139
evolve that does something \o/
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 17 Feb 2012 19:08:36 +0100] rev 138
stuff that pass
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 17 Feb 2012 19:01:25 +0100] rev 137
fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 17 Feb 2012 17:55:12 +0100] rev 136
add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 17 Feb 2012 17:53:00 +0100] rev 135
obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 17 Feb 2012 10:35:46 +0100] rev 134
add a simple script to help people enabling the extension.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 17 Feb 2012 10:29:01 +0100] rev 133
rename evolution to evolve
too much confusion with the email client
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 24 Jan 2012 09:53:34 +0100] rev 132
obsolete: alter newerversion return
prepare ability to split and return kill information.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 23 Jan 2012 18:22:10 +0100] rev 131
keep branch on amend
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 11 Jan 2012 17:01:06 +0100] rev 130
evolution: add a --new argument for kill
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 10 Jan 2012 19:52:44 +0100] rev 129
obsolete: lazy relation adding
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 10 Jan 2012 10:59:18 +0100] rev 128
obsolete: remove outgoing filtering as it is taken care but forcing obsolete to be secret
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 09 Jan 2012 20:25:48 +0100] rev 127
Add gup and gdown command to mimic qpop and qpush command
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 08 Jan 2012 18:43:49 +0100] rev 126
obsolete: stop using rev as it rebuild the cache every time there is a fault
We now use nodemap directly
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 08 Jan 2012 18:41:49 +0100] rev 125
remove dead comment
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 07 Jan 2012 15:45:40 +0100] rev 124
obsolete: clever obsolete not in secret detection to avoid locking the repo without a reason.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 07 Jan 2012 11:40:45 +0100] rev 123
obsolete: fix locking when enforcing obsolete as secret
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 07 Jan 2012 11:33:20 +0100] rev 122
Locking while writing obsolete data.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 07 Jan 2012 11:26:48 +0100] rev 121
obsolete: improve locking when writing obsolete data
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 07 Jan 2012 11:20:59 +0100] rev 120
obsolete: remove public revset (it's now expected to be in core)
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 07 Jan 2012 11:19:12 +0100] rev 119
evolution: proper locking scheme
(maybe a bit zelous with wlock and lock)
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 29 Dec 2011 03:09:21 +0100] rev 118
edit option \o/
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 28 Dec 2011 13:10:24 +0100] rev 117
Add a -o and -O option to graft.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 28 Dec 2011 12:38:01 +0100] rev 116
Add a -o option to commit
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 22 Dec 2011 15:26:42 +0100] rev 115
add an option to ensure unstable are secret
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 19 Dec 2011 16:27:00 +0100] rev 114
nicer hiddenrevs init
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 19 Dec 2011 14:37:24 +0100] rev 113
adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 19 Dec 2011 14:05:25 +0100] rev 112
adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 19 Dec 2011 14:05:05 +0100] rev 111
more removal from phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 19 Dec 2011 12:25:19 +0100] rev 110
remote the states extention. (phase are now in mercurial core)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 19 Dec 2011 12:19:00 +0100] rev 109
obsolete: smarter initialisation of obsolete stuff from disk.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 19 Dec 2011 12:18:04 +0100] rev 108
Properly inherit phase of relocated changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 28 Nov 2011 00:59:42 +0100] rev 107
Add a states.bypass option to push without touching state.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 28 Nov 2011 00:59:18 +0100] rev 106
Allow setstate with the last non trcked state.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 28 Nov 2011 00:57:49 +0100] rev 105
Add missing break line at the end of a debug message
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Oct 2011 19:22:57 +0200] rev 104
propertly handle -m and -l option
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Oct 2011 19:22:41 +0200] rev 103
amend: add a --branch option
Alain Leufroy <alain.leufroy@logilab.fr> [Thu, 29 Sep 2011 15:23:56 +0200] rev 102
monkeypatch strip fancier
Alain Leufroy <alain.leufroy@logilab.fr> [Wed, 28 Sep 2011 22:04:52 +0200] rev 101
fix strip - seems good enougth now
Alain Leufroy <alain.leufroy@logilab.fr> [Wed, 28 Sep 2011 12:35:55 +0200] rev 100
[states] fix strip but one thing still stay wrong (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr> [Tue, 27 Sep 2011 11:25:13 +0200] rev 99
[states] fix strip but a case still does not work (see test test-state-strip.t)
Alain Leufroy <alain.leufroy@logilab.fr> [Sun, 25 Sep 2011 12:46:45 +0200] rev 98
[states] make enabling state saftier
* Fix the lower state heads while enabling a state.
* Add a --clever opiton that do not fix the lower heads (as earlier)
* Add test for enable/disable state
Alain Leufroy <alain.leufroy@logilab.fr> [Thu, 22 Sep 2011 19:18:40 +0200] rev 97
[states] make disabling state saftier
It is not allowed to disable a state that is not empty
because "Explicit is better than implicit".
A hint is displayed to help the user.
Alain Leufroy <alain.leufroy@logilab.fr> [Sun, 25 Sep 2011 12:43:00 +0200] rev 96
[states] add --exact option to `hg <state> <nodes>` that allows to backward states bondaries
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 21 Sep 2011 03:52:13 +0200] rev 95
improve tuto
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 21 Sep 2011 03:49:59 +0200] rev 94
[evolution:evolve] use short hex instead of rev number
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Sep 2011 18:17:08 +0200] rev 93
docs: Small tutorial
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Sep 2011 18:16:40 +0200] rev 92
[evolution:amend] prevent amending immutable changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 20 Sep 2011 18:15:48 +0200] rev 91
[evolution:relocate] propertly interpred src and destination.
Alain Leufroy <alain.leufroy@logilab.fr> [Tue, 13 Sep 2011 15:35:49 +0200] rev 90
[states] do not activate deactivated state with ``hg states --off <state>``
previously:
$ hg init alpha
$ cd alpha
$ hg states --off draft
$ hg states
published
draft
now:
$ hg init alpha
$ cd alpha
$ hg states --off draft
$ hg states
published
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 19 Sep 2011 18:27:30 +0200] rev 89
[obsolet] base64 encore obsolete rel for pushkey
Yop this is ugly
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 19 Sep 2011 18:03:51 +0200] rev 88
[evolution] first workign draft of a relocate function
The relocate function is a lighter rebase.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 19 Sep 2011 03:18:08 +0200] rev 87
[evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 19 Sep 2011 01:57:43 +0200] rev 86
[obsolete] code section comment for repo subclassing
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 19 Sep 2011 01:57:14 +0200] rev 85
[obsolete] vocabulary update suggestion
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 19 Sep 2011 01:56:48 +0200] rev 84
[obsolete] rebase always keep changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 19 Sep 2011 01:55:35 +0200] rev 83
Compat with mercurial 1.9.2
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 19 Sep 2011 01:11:10 +0200] rev 82
[evolution] imported hg amend from parren works
(this rocks heavily)
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 14 Sep 2011 22:29:19 +0200] rev 81
Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 14 Sep 2011 19:52:57 +0200] rev 80
[obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 14 Sep 2011 19:20:38 +0200] rev 79
[obsolete] issue a warning when parent of current directory is obsolete.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 14 Sep 2011 17:55:17 +0200] rev 78
[states] add some documentation for extension wrapping
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 14 Sep 2011 17:51:25 +0200] rev 77
[states] update qimport code so it doesn't fails on qimport without -r
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 14 Sep 2011 17:40:24 +0200] rev 76
mention plan for hook in the documentation
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 13 Sep 2011 22:05:19 +0200] rev 75
[obsolete] published changeset can't be obsoleted
states extension is now required.
A warning message is emitted when obsoleting a published changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 13 Sep 2011 22:19:28 +0200] rev 74
[obsolete] update docstring
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 13 Sep 2011 21:40:37 +0200] rev 73
[obsolete] remove useless code.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 13 Sep 2011 21:38:18 +0200] rev 72
[obsolete] rationalize doc header.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 13 Sep 2011 21:37:28 +0200] rev 71
[obsolete] Move extension compat code
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 13 Sep 2011 21:29:52 +0200] rev 70
[obsolete] extract serialization logic.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 13 Sep 2011 21:15:31 +0200] rev 69
[obsolete] update doc
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 13 Sep 2011 20:24:44 +0200] rev 68
[state] Update doc on the mutable property of state (and the way it's implemented)
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 13 Sep 2011 01:10:18 +0200] rev 67
[state] add mutable property to state object.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 13 Sep 2011 01:01:05 +0200] rev 66
[states] add a todo related to MQ
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 13 Sep 2011 00:58:18 +0200] rev 65
[states] fix a bug with rebase --detach
There is unexpected (for me) content in state.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 13 Sep 2011 00:45:42 +0200] rev 64
[states] add mq support
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 12 Sep 2011 23:47:06 +0200] rev 63
[states] add rebase support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 12 Sep 2011 19:35:50 +0200] rev 62
[states] move IO logic outside the repository subclass
This is meant to lighted this part a bit
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 12 Sep 2011 19:23:35 +0200] rev 61
[states] add a small paragraph about controlling permision to move the boundary
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 12 Sep 2011 14:05:32 +0200] rev 60
small refactoring and big doc update.
Sorry for the big commit crecord one so much diff seems to confuse my powerbook
to death :-/
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 09 Sep 2011 15:56:50 +0200] rev 59
move part of the readme about states in states itself.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 09 Sep 2011 11:15:59 +0200] rev 58
[obsolete] Fix pushkey
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 09 Sep 2011 11:15:44 +0200] rev 57
Use dedicated mechanism to report pushkey success
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 08 Sep 2011 19:07:00 +0200] rev 56
[obsolete] Update pushkey code
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 08 Sep 2011 19:03:42 +0200] rev 55
Update pushkey code to be able to push ready heads too.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 08 Sep 2011 18:20:01 +0200] rev 54
Make states more resilient to missing head
In particuliar pushkey is now more robust (with a very naif approach)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 08 Sep 2011 17:46:54 +0200] rev 53
reorganise code
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 08 Sep 2011 17:32:51 +0200] rev 52
Rollback support