Loosing revision history after rename and compress/rebase
Weichelt David J
WeicheltDavid at JohnDeere.com
Tue Jan 7 17:08:38 UTC 2014
Response below.
-----Original Message-----
From: Matt Mackall [mailto:mpm at selenic.com]
Sent: Friday, January 03, 2014 6:13 PM
To: Weichelt David J
Cc: mercurial at selenic.com; Albright Steve; Bogh Jason; Faber Ross
Subject: Re: Loosing revision history after rename and compress/rebase
On Fri, 2014-01-03 at 22:53 +0000, Weichelt David J wrote:
> I'm looking for support on this problem we have seen. The scenario was confirmed with other developers and it perhaps needs to be fixed by the Mercurial community... we don't know how to work around this. Not cool to loose revision history from code that we are moving around and changing.
>
> Steps to reproduce:
>
> 1. Have a committed file with a revision history
>
> 2. Hg rename the file from one directory to a new one (with renaming the file in my testing)
>
> 3. Commit the changes
>
> 4. Compress the changes (also can see same problem with rebase)
This is not a term in our jargon. Perhaps you mean rebase --collapse? Or perhaps the THG project has taken to introducing their own jargon.
<David> THG has compress and rebase as two different options.
> 5. (optional) Strip the original changset that was compressed
>
> 6. Notice that the revision history is missing on the new changeset
Are you saying that the renamed file does not have any evidence of linkage to the original file? How are you determining this?
<David> Yes, the renamed file doesn't have evidence of linkage to the original file (and thus the history of the original file). It appears that the renamed file is a new file with only 1 changeset.
--
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial
mailing list