Closed GoogleCodeExporter closed 9 years ago
For instance, the workflow fixing a bug in dshowvideosrc and saving the patch
until
it's applied upstream would be:
* Work on the patch
* Local commit to git repo
* format the patch in git format using 'git format-path'. This will produce a file
named '0001-dshowvideosrc-add-support-for-yuy2.patch'.
* store the patch in the patches's folder.
* Commit to svn the patch file and the cahnges to the source code.
Or for example, if we find out that commit 34ad234c, fixes a bug in udpsink:
* Apply the patch using git cherry-pick
* Commit the changes to svn
Original comment by ylatuya
on 21 Mar 2010 at 1:48
i know nothing about git to be honest. and running git under windows isn't
pretty,
from what i understand. but as long as i can continue to use it the way we've
been
doing it (and you can do it the way you'd like to), then i'd be fine with it. i
don't see, though, how you can keep the two in sync since git commits that
would
delete a file or folder, for instance, couldn't be reflected in the svn repo.
how
would you resolve that?
i'd suggest you branch first, put in your changes, and then if it all works,
merge
back into the trunk.
Original comment by david.g.hoyt
on 21 Mar 2010 at 8:14
TortiseGIT works fine under windows :-)
Original comment by andy.blu...@gmail.com
on 16 Sep 2010 at 2:13
This doesn't seem to be an issue anymore due to our pending build system
changes. Do you agree, ylatuya?
Original comment by david.g.hoyt
on 23 Mar 2011 at 8:48
right, closing :)
Original comment by ylatuya
on 24 Mar 2011 at 5:36
Original issue reported on code.google.com by
ylatuya
on 21 Mar 2010 at 1:39