Hello all,
I am leading a subversion to git migration where I work and things are
going OK so far. One weird thing we are noticing is when we're cherry-
picking old commits from the an old subversion integration branch into
several separate new topic branches each for a previous feature that
was in progress, we're seeing weird results.
For instance, here is a file diff from a commit I am cherry picking:
diff --git a/path/to/file b/path/to/file
index b0cd7f5..21992d7 100644
--- a/path/to/file
+++ b/path/to/file
@@ -158,6 +158,10 @@ class ASDF {
return 'sisu';
case 'systemEmail':
return 'syse';
+ case 'tag':
+ return 'tag';
+ case 'tagObject':
+ return 'tagb';
case 'tracker':
return 'tr';
case 'trackerRedirect':
However when I perform the cherry pick, git is changing other parts of
the file that weren't touched and don't match up to the above diff.
What I was expecting to happen would be as if I had manually created a
patch out of the diff from the specified commit and then applied that
patch to the current branch.
My understanding is a cherry pick essentially takes the changes made
in a particular commit and then applies those same changes to the
files in the current working tree. So, why would I be seeing other
changes? What i'm afraid is happening is git is doing a diff between
current commit and the commit specified in the cherry-pick and
applying those changes instead, which is definitely not what I want.
Where am I going wrong?
Thanks,
-Zach
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/git-users?hl=en.
