9:21 a.m.
Updating igraph to 0.5.4. Success for devel and f14. Then for f13 I get:
fedpkg switch-branch f13
Branch f13 set up to track remote
branch f13/master from origin.
git merge master
CONFLICT (rename/delete): Rename
.cvsignore->.gitignore in HEAD and deleted
in master
Automatic merge failed; fix conflicts and then commit the result.
Strange, that seems to be the same thing I did for f14. How do I fix?
9:44 a.m.
Neal Becker wrote:
Updating igraph to 0.5.4. Success for devel and f14. Then for f13 I
get:
> fedpkg switch-branch f13
Branch f13 set up to track remote branch f13/master from origin.
> git merge master
CONFLICT (rename/delete): Rename .cvsignore->.gitignore in HEAD and deleted
in master
Automatic merge failed; fix conflicts and then commit the result.
Strange, that seems to be the same thing I did for f14. How do I fix?
The merge works well for f14 because it was branched from master after
the conversion to git. Prior release were "branched" in cvs and the
git conversion imported those branches with different histories. So
the first merge you do into an older branch usually needs some
massassing. There's an open fedpkg ticket to improve this.
On a few of my packages where I wanted to sync f13 from master, I used
this:
git merge -s recursive -X theirs master
This tells git that when there are conflicts in the merge, resolve
them automatically by preferring the content from the master branch
('theirs').
--
Todd OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Never attribute to malice that which can be adequately explained by
stupidity.
-- Hanlon's Razor
10:05 a.m.
Todd Zullinger wrote:
Neal Becker wrote:
> Updating igraph to 0.5.4. Success for devel and f14. Then for f13 I
> get:
>
>> fedpkg switch-branch f13
> Branch f13 set up to track remote branch f13/master from origin.
>
>> git merge master
> CONFLICT (rename/delete): Rename .cvsignore->.gitignore in HEAD and
> deleted in master
> Automatic merge failed; fix conflicts and then commit the result.
>
> Strange, that seems to be the same thing I did for f14. How do I fix?
The merge works well for f14 because it was branched from master after
the conversion to git. Prior release were "branched" in cvs and the
git conversion imported those branches with different histories. So
the first merge you do into an older branch usually needs some
massassing. There's an open fedpkg ticket to improve this.
On a few of my packages where I wanted to sync f13 from master, I used
this:
git merge -s recursive -X theirs master
This tells git that when there are conflicts in the merge, resolve
them automatically by preferring the content from the master branch
('theirs').
Let's try:
$rm -rf igraph
$fedpkg clone igraph
Cloning into igraph...
remote: Counting objects: 301, done.
remote: Compressing objects: 100% (153/153), done.
remote: Total 301 (delta 136), reused 294 (delta 133)
Receiving objects: 100% (301/301), 32.20 KiB, done.
Resolving deltas: 100% (136/136), done.
$cd igraph
$fedpkg switch-branch f13
Branch f13 set up to track remote branch f13/master from origin.
$ git merge -s recursive -X theirs master
CONFLICT (rename/delete): Rename .cvsignore->.gitignore in HEAD and deleted
in master
Automatic merge failed; fix conflicts and then commit the result.
10:23 a.m.
Neal Becker <ndbecker2(a)gmail.com> writes:
Let's try:
$rm -rf igraph
Btw., you can undo a failed merge with "git reset --merge".
Andreas.
--
Andreas Schwab, schwab(a)redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E
"And now for something completely different."
10:14 a.m.
On 09/16/2010 04:21 PM, Neal Becker wrote:
Updating igraph to 0.5.4. Success for devel and f14. Then for f13 I
get:
> fedpkg switch-branch f13
Branch f13 set up to track remote branch f13/master from origin.
> git merge master
CONFLICT (rename/delete): Rename .cvsignore->.gitignore in HEAD and deleted
in master
Automatic merge failed; fix conflicts and then commit the result.
Strange, that seems to be the same thing I did for f14. How do I fix?
What are you trying to do? I guess `git cherry-pick' will work for you.
RR
10:23 a.m.
Roman Rakus wrote:
On 09/16/2010 04:21 PM, Neal Becker wrote:
> Updating igraph to 0.5.4. Success for devel and f14. Then for f13 I get:
>
>> fedpkg switch-branch f13
> Branch f13 set up to track remote branch f13/master from origin.
>
>> git merge master
> CONFLICT (rename/delete): Rename .cvsignore->.gitignore in HEAD and deleted
> in master
> Automatic merge failed; fix conflicts and then commit the result.
>
> Strange, that seems to be the same thing I did for f14. How do I fix?
>
What are you trying to do? I guess `git cherry-pick' will work for you.
Or you can just resolve the merge conflict yourself. You only have to
merge the disparate branches once. :-\
9:41 a.m.
On Thu, 16 Sep 2010 10:21:02 -0400, Neal Becker wrote:
Updating igraph to 0.5.4. Success for devel and f14. Then for f13
I
get:
> fedpkg switch-branch f13
Branch f13 set up to track remote branch f13/master from origin.
> git merge master
CONFLICT (rename/delete): Rename .cvsignore->.gitignore in HEAD and
deleted in master
Automatic merge failed; fix conflicts and then commit the result.
Strange, that seems to be the same thing I did for f14. How do I fix?
Sometimes the merge can be resolved without conflict if you first merge
an older commit; try finding the commit ID for the dist-git conversion on
the master branch, and on the F-13 branch, git merge COMMITID followed by
git merge master
--
Michel Alexandre Salim
Fedora Project Contributor: http://fedoraproject.org/
Email: salimma(a)fedoraproject.org | GPG key ID: 78884778
Jabber: hircus(a)jabber.ccc.de | IRC: hircus(a)irc.freenode.net
() ascii ribbon campaign - against html e-mail
/\ www.asciiribbon.org - against proprietary attachments
2:58 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 09/16/2010 07:21 AM, Neal Becker wrote:
Updating igraph to 0.5.4. Success for devel and f14. Then for f13 I
get:
> fedpkg switch-branch f13
Branch f13 set up to track remote branch f13/master from origin.
> git merge master
CONFLICT (rename/delete): Rename .cvsignore->.gitignore in HEAD and deleted
in master
Automatic merge failed; fix conflicts and then commit the result.
Strange, that seems to be the same thing I did for f14. How do I fix?
- From testing here, I think you can just do:
git add .gitignore
git commit
then your merge will complete.
- --
Jesse Keating RHCE (http://jkeating.livejournal.com)
Fedora Project (http://fedoraproject.org/wiki/JesseKeating)
GPG Public Key (geek.j2solutions.net/jkeating.j2solutions.pub)
identi.ca (http://identi.ca/jkeating)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/
iEYEARECAAYFAkyTyF0ACgkQ4v2HLvE71NXI5wCgl0UwZZAuWK4mazuAWTEqOQrv
lP4AmwbMIfRPpwSbFsid84436LmhSjeE
=riRs
-----END PGP SIGNATURE-----
5012
days inactive
5013
days old
8 comments
7 participants
participants (7)
-
Andreas Schwab -
Garrett Holmstrom -
Jesse Keating -
Michel Alexandre Salim -
Neal Becker -
Roman Rakus -
Todd Zullinger