2009-02-25 173 views

回答

11

你可以用MQ(水银队列)轻松地做到这一点:

设置了错误的日期回购

+ hg init 
+ echo line 
+ hg commit -A -d 12/1 -m first 
adding file 
+ echo line 
+ hg commit -A -d 12/2 -m second 
+ echo line 
+ hg commit -A -d 12/3 -m third 
+ hg log 
changeset: 2:81c88de729a8 
tag:   tip 
user:  Ry4an Brase <[email protected]> 
date:  Thu Dec 03 00:00:00 2009 -0600 
summary:  third 

changeset: 1:c1fe70008824 
user:  Ry4an Brase <[email protected]> 
date:  Wed Dec 02 00:00:00 2009 -0600 
summary:  second 

changeset: 0:abb97adaa541 
user:  Ry4an Brase <[email protected]> 
date:  Tue Dec 01 00:00:00 2009 -0600 
summary:  first 

打开的变更到补丁队列

+ hg qimport -r 2 
+ hg qimport -r 1 
+ hg qimport -r 0 

使每个依次修补qtip并修复日期

+ hg qrefresh -D 
+ hg qpop 
Now at: 1.diff 
+ hg qrefresh -D 
+ hg qpop 
Now at: 0.diff 
+ hg qrefresh -D 

重新应用补丁

+ hg qpush 
applying 1.diff 
Now at: 1.diff 
+ hg qpush 
applying 2.diff 
Now at: 2.diff 

打开每个补丁回到现实的变更

+ hg qdel -r 0 
+ hg qdel -r 1 
+ hg qdel -r 2 

要好:

+ hg log 
changeset: 2:6b51e14aadfc 
tag:   tip 
user:  Ry4an Brase <[email protected]> 
date:  Wed Feb 25 22:29:01 2009 -0600 
summary:  third 

changeset: 1:5cbb9fc51bcc 
user:  Ry4an Brase <[email protected]> 
date:  Wed Feb 25 22:29:02 2009 -0600 
summary:  second 

changeset: 0:ec58d1f24278 
user:  Ry4an Brase <[email protected]> 
date:  Wed Feb 25 22:29:02 2009 -0600 
summary:  first 
10

还有​​标志为hg commit,这是你如何覆盖提交时间。问题在于如何在没有工具太多痛苦的情况下重新承诺早期的更改

让我们假设你得到本地提交下列病史:

dir1> hg commit # r100, OK 
dir1> hg commit # r101, need to fix time 
dir1> hg commit # r102, need to fix time 

这里是我的解决方案:

hg diff -r100:101 > 101.diff 
hg diff -r101:102 > 102.diff 
cd .. 
hg clone -r100 dir1 dir2 # create a copy just before changesets than needs to be fixed 
cd dir2 
patch -i ../dir1/101.diff 
hg commit -m "Same commit message" --date="required date" 
patch -i ../dir1/102.diff 
hg commit -m "Same commit message" --date="required date" 
cd .. 
rm -rf dir1 && mv dir2 dir1 # replace working copy 

您可以自动与hg patch补丁的应用程序,我没有在我的实践中使用且。

+0

一个简单而干净的方式。谢谢! – 2009-02-26 12:09:56

+3

您可以使用“hg strip”删除有问题的修订而不是克隆。 – skypher 2009-03-01 13:25:10

8

如果它只是一个单一的承诺,这承诺是最近一个(无论你在哪一个分支上),这样做的快速单线是:

hg commit --amend -d now 
相关问题