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

Michael Niedermayer michaelni
Tue May 1 23:34:57 CEST 2007


On Tue, May 01, 2007 at 11:42:37PM +0300, Uoti Urpala wrote:
> On Tue, 2007-05-01 at 21:57 +0200, Michael Niedermayer wrote:
> > as can be seen git properly merged the later change to "test" it didnt just
> > recommit it with a new date, also:
> If you use "git cherry-pick" that does create a new commit for the
> change. It just uses the same commit message and timestamp by default
> (equivalent to using the "-c" flag to commit, and you can change those
> if you want).
> > shows that the bad change is properly removed
> Note that what you're doing here is basically building a new
> repository/branch from scratch with a different history. 

not from scratch, from the point 2 commits ago where the branch branches

> You can't
> remove a "bad" part of history in an existing branch. This is similar to
> rebuilding a repository in svn.
> Now easy "rebuilds" to create a revised version of history are more
> useful with git because you can have private or semiprivate branches
> with history containing several commits, and then rebuild the history
> before committing it to a more public repository. However if you modify
> already existing history like that in a public repository it will break
> all existing checkouts (basically you're removing the existing branch
> and replacing it with a different one with the same name).

hmm so git uses the branch name and will fatally fail if it gets renamed?
also note i did NOT remove any branch i just renamed them

now lets assume i dont rename master<->new_branch, then this should work
fine, using new_branch instead of master?
i cant see how this could fail, i just create a new branch (like a branch
for a release) i port a few good changes from one branch to the other and
then just continue development with the new branch ...


Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

In a rich man's house there is no place to spit but his face.
-- Diogenes of Sinope
-------------- 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/20070501/aee687c1/attachment.pgp>

More information about the ffmpeg-devel mailing list