[Bug 5118] New: split should warn about using stabilize when creating troubled changes

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Fri Feb 26 16:52:13 UTC 2016


https://bz.mercurial-scm.org/show_bug.cgi?id=5118

            Bug ID: 5118
           Summary: split should warn about using stabilize when creating
                    troubled changes
           Product: Mercurial
           Version: 3.7.1
          Hardware: PC
                OS: Mac OS
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: evolution
          Assignee: bugzilla at selenic.com
          Reporter: nathan12343 at gmail.com
                CC: mercurial-devel at selenic.com,
                    pierre-yves.david at ens-lyon.org

Steps to reproduce:

mkdir test-repo
cd test-repo
hg init
echo "some test" > file.txt
hg add file.txt
hg ci -m "adding a file"
echo "some more text" >> file.txt
echo "more text" >> file.txt
hg ci -m "adding more text"
echo "even more text" >> file.txt
hg ci -m "yet more text"
hg up 1
hg split
<select only one line, edit commit message for new commit>

After doing this, I get the following text printed to stdout:

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
reverting file.txt
starting interactive selection
created new head
Done splitting? [yN] y

and the log looks like:

@  changeset:   4:de0d8f062659
|  tag:         tip
|  user:        Nathan Goldbaum <ngoldbau at ucsc.edu>
|  date:        Fri Feb 26 10:47:55 2016 -0600
|  summary:     adding more text
|
o  changeset:   3:7c6da0a348da
|  parent:      0:b91aad4f1250
|  user:        Nathan Goldbaum <ngoldbau at ucsc.edu>
|  date:        Fri Feb 26 10:47:34 2016 -0600
|  summary:     adding some more text
|
| o  changeset:   2:ae32512f451d
| |  user:        Nathan Goldbaum <ngoldbau at ucsc.edu>
| |  date:        Fri Feb 26 10:47:25 2016 -0600
| |  summary:     yet more text
| |
| x  changeset:   1:837eb525698e
|/   user:        Nathan Goldbaum <ngoldbau at ucsc.edu>
|    date:        Fri Feb 26 10:47:25 2016 -0600
|    summary:     adding more text
|
o  changeset:   0:b91aad4f1250
   user:        Nathan Goldbaum <ngoldbau at ucsc.edu>
   date:        Fri Feb 26 10:47:24 2016 -0600
   summary:     adding a file


It would be nice if split printed out a warning to use "hg evolve" to stabilize
history after creating this new head. Even better if split automatically did
the rebase.

-- 
You are receiving this mail because:
You are on the CC list for the bug.


More information about the Mercurial-devel mailing list