[FFmpeg-devel] [Ffmpeg-devel] SVN dump

[Michael Niedermayer]

Hi

On Wed, May 02, 2007 at 04:22:24PM +0200, Michael Niedermayer wrote:
> Hi
> 
> On Wed, May 02, 2007 at 02:57:12PM +0100, Andy Parkins wrote:
> > On Wednesday 2007 May 02, Michael Niedermayer wrote:
> > 
> > Apologies in advance for the length of this message; I'm trying to be 
> > thorough, but it's probably all a bit boring.
> > 
> > > because of that we need to be able to fix mistakes and sending everyone a
> > > mail saying "hg strip 1234deadbeef" is not an option. thats even more
> > > primitive than cvs
> > 
> > I'm curious - what is the procedure now to undo a commit in subversion?
> > 
> >  * -- * -- * -- * -- B -- * -- * -- *
> > 
> > How do you get rid of B without damaging the subsequent commits?
> 
> well that depends
> if B is just a normal buggy change simple reverting it by applying the
> change in reverse and commiting is done
> 
> if OTOH B is some really serious messup like someone replacing all \n by
> spaces or more realistic someone commiting a huge whitespace change with
> some unrelated functional changes in the middle then the proper solution
> with svn is to svn copy the last good revision of the file, commit
> the change properly and be done, if later commits happened its very unlikely
> that they touched the same file. if they still did these would have to be
> recommited
> 
> 
> > 
> > I ask only because whatever procedure you use with subversion would probably 
> > work with git.
> 
> and indeed the copy trick almost worked with git when i tried it
> if only git would properly support copies (or alternatively its copy
> detection where working but half of the time i tried it git didnt find
> the parent file ...)

to demonstrate the problem iam having with git copy:
--------------------
$echo ABC>newtest
$git add newtest ; git commit
Created commit eddb13c7016e436e1500d2acff21ba585e8ac705
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 newtest

$echo DEF>>newtest
$git add newtest ; git commit
Created commit 864c1e9adfd301e592bd20dd1d5a9014c800205d
 1 files changed, 1 insertions(+), 0 deletions(-)

$echo ghijk>>newtest
$git add newtest ; git commit
Created commit 1e1191f4bd423d870470f04bb65dbd05d11cd076
 1 files changed, 1 insertions(+), 0 deletions(-)

$git blame -C1 -C1 newtest 
eddb13c7 (Michael Niedermayer 2007-05-02 16:30:51 +0200 1) ABC
864c1e9a (Michael Niedermayer 2007-05-02 16:31:06 +0200 2) DEF
1e1191f4 (Michael Niedermayer 2007-05-02 16:31:20 +0200 3) ghijk

$cp newtest newtest2
$git add newtest2 ; git commit
Created commit 83381836b7dbd65b7a9c4be8763e6037e0441bde
 1 files changed, 3 insertions(+), 0 deletions(-)
 create mode 100644 newtest2

$git blame -C1 -C1   newtest2
83381836 (Michael Niedermayer 2007-05-02 16:32:02 +0200 1) ABC
83381836 (Michael Niedermayer 2007-05-02 16:32:02 +0200 2) DEF
83381836 (Michael Niedermayer 2007-05-02 16:32:02 +0200 3) ghijk

$vim newtest2
$git add newtest2 ; git commit
Created commit 6eee697ed430a27288c1c072e4eecb7f1753cff0
 1 files changed, 1 insertions(+), 0 deletions(-)

git blame -C1 -C1   newtest2
eddb13c7 newtest  (Michael Niedermayer 2007-05-02 16:30:51 +0200 1) ABC
864c1e9a newtest  (Michael Niedermayer 2007-05-02 16:31:06 +0200 2) DEF
6eee697e newtest2 (Michael Niedermayer 2007-05-02 16:32:45 +0200 3) XXXX
83381836 newtest2 (Michael Niedermayer 2007-05-02 16:32:02 +0200 4) ghijk

----------------

as you can see git does first not detect the copy but then after i add a
random change into it it detects that the lines prior to the change are
copied, whatever is afterwards is not detected

i tried google and RTFM but i have no idea what i am doing wrong

$git --version
git version 1.5.1.2

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Republics decline into democracies and democracies degenerate into
despotisms. -- Aristotle
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20070502/b15b3b70/attachment.pgp>