This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12417

tests: add test for rebasing commit after amending rename into parent
Needs ReviewPublic

Authored by martinvonz on Mar 30 2022, 12:18 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This adds a test for
https://bz.mercurial-scm.org/show_bug.cgi?id=5457.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mtests/test-copies.t (31 lines)

Diff 32731

tests/test-copies.t

a a
Now if we trigger a merge between revision 3 and 6 using base revision 4, Now if we trigger a merge between revision 3 and 6 using base revision 4,
neither of the merging csets will be a descendant of the base revision: neither of the merging csets will be a descendant of the base revision:
$ hg graft -r 6 --base 4 --hidden -t :other $ hg graft -r 6 --base 4 --hidden -t :other
grafting 6:99802e4f1e46 "added willconflict and d" (tip) (no-changeset !) grafting 6:99802e4f1e46 "added willconflict and d" (tip) (no-changeset !)
grafting 6:b19f0df72728 "added willconflict and d" (tip) (changeset !) grafting 6:b19f0df72728 "added willconflict and d" (tip) (changeset !)
Test rebasing a commit after amending rename of added file into its parent
(issue 5457)
$ cat << EOF >> $HGRCPATH
> [experimental]
> evolution.createmarkers = True
> evolution.allowunstable = True
> EOF
$ newrepo
$ echo a > a
$ hg add a
$ hg ci -m "added a"
$ echo b > b
$ hg add b
$ hg ci -m "added b"
$ echo modified > b
$ hg ci -m "modified b"
$ hg co '.^'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg mv b c
$ hg ci --amend -m "added c"
1 new orphan changesets
$ hg rebase -s 'desc("modified b")' -d .
rebasing 2:e3e0011b43ad "modified b" (changeset !)
rebasing 2:2612b8963c3f "modified b" (no-changeset !)
file 'b' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[240]