* troubles in supersede old development history (git-svn)
@ 2007-01-07 9:29 Songmao Tian
2007-01-08 2:44 ` Eric Wong
0 siblings, 1 reply; 2+ messages in thread
From: Songmao Tian @ 2007-01-07 9:29 UTC (permalink / raw)
To: git
our trunk's maintainer is lazy in merging branches, I'd like to merge
the branch kkmao, and now there are so many the conflicts. I want to
just use my version and overcome all the conflicts.
i try in this way:
git-checkout -b trunk remotes/trunk
git-rebase --merge -s ours remotes/kkmao
git-svn dcommit -i trunk
diff-tree 9b75e30191838431810aec4eda98482a8d6935ed~1
9b75e30191838431810aec4eda98482a8d6935ed
Transaction is out of date: Out of date:
'trunk/Targets/Bonito/conf/Bonito.lmbox' in transaction '74-3' at
/home/kkmao/bin/git-svn line 1577
so what's the solution?
and another question. I use normal merge strategy
git-svn remotes/kkmao
got some conflicts..
and one file is missing, i have to git-ls-files -u to see what's beneath.
git-ls-files -u
100644 f7a66ae00d4034ab580e4ee71b0eaccc3a3e44e7 1
Targets/Bonito/conf/Bonito
100644 e6f5d90b30c3ee694acd2199a03e8f34ef1412ac 3
Targets/Bonito/conf/Bonito
I have read some doc, but I think I am still not good at resolve conflict:)
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: troubles in supersede old development history (git-svn)
2007-01-07 9:29 troubles in supersede old development history (git-svn) Songmao Tian
@ 2007-01-08 2:44 ` Eric Wong
0 siblings, 0 replies; 2+ messages in thread
From: Eric Wong @ 2007-01-08 2:44 UTC (permalink / raw)
To: Songmao Tian; +Cc: git
Songmao Tian <kingkongmao@gmail•com> wrote:
> our trunk's maintainer is lazy in merging branches, I'd like to merge
> the branch kkmao, and now there are so many the conflicts. I want to
> just use my version and overcome all the conflicts.
>
> i try in this way:
>
> git-checkout -b trunk remotes/trunk
> git-rebase --merge -s ours remotes/kkmao
> git-svn dcommit -i trunk
> diff-tree 9b75e30191838431810aec4eda98482a8d6935ed~1
> 9b75e30191838431810aec4eda98482a8d6935ed
> Transaction is out of date: Out of date:
> 'trunk/Targets/Bonito/conf/Bonito.lmbox' in transaction '74-3' at
> /home/kkmao/bin/git-svn line 1577
>
> so what's the solution?
Probably obvious, but is remotes/trunk up-to-date with git-svn fetch?
Next, can you ensure that the tree referenced by
9b75e30191838431810aec4eda98482a8d6935ed~1 (note the ~1) is the same
as remotes/trunk?
(git diff 9b75e30191838431810aec4eda98482a8d6935ed~1 remotes/trunk)
Unfortunately, I'm not familiar with how the 'ours' strategy works with
rebase --merge. I generally use the default recursive. Can you look
at the history in gitk to see if the history from refs/remotes/trunk
to refs/heads/trunk is linear?
> and another question. I use normal merge strategy
> git-svn remotes/kkmao
> got some conflicts..
>
> and one file is missing, i have to git-ls-files -u to see what's beneath.
> git-ls-files -u
> 100644 f7a66ae00d4034ab580e4ee71b0eaccc3a3e44e7 1
> Targets/Bonito/conf/Bonito
> 100644 e6f5d90b30c3ee694acd2199a03e8f34ef1412ac 3
> Targets/Bonito/conf/Bonito
>
> I have read some doc, but I think I am still not good at resolve conflict:)
Just look at the file in question; edit it and resolve
the conflicts in it and then git commit <conflicted files>
--
Eric Wong
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-01-08 2:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-07 9:29 troubles in supersede old development history (git-svn) Songmao Tian
2007-01-08 2:44 ` Eric Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox