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