Mercurial > hg

annotate tests/bundles/rebase.hg @ 17646:d44731a3adb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit-test: ensure that non commute test will never commute The previous version would commute if using merge algorithm (to be accurate, merge will cleanly prompt the user during the merge). The new version create and initial commit with some content for all involved files en ensure all changes are a content changes of the first lines. This lead to guaranteed conflict when commuted.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Fri, 21 Sep 2012 19:13:25 +0200
parents 624e5ce615ec
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14119
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14118
diff changeset
1 (binary:application/octet-stream)