* git submodule vs git mergetool
@ 2011-01-18 9:04 Mathieu Malaterre
2011-01-19 18:40 ` Jens Lehmann
0 siblings, 1 reply; 2+ messages in thread
From: Mathieu Malaterre @ 2011-01-18 9:04 UTC (permalink / raw)
To: git
Hi there,
not sure if this is the right place to report a problem. anyway I
have two branches (release and master) each one has a Testing/Data
submodule:
git submodule add git://gdcm.git.sourceforge.net/gitroot/gdcm/gdcmData
Testing/Data
During a merge those two submodules produced a conflict:
$ git mergetool
merge tool candidates: meld opendiff kdiff3 tkdiff xxdiff
tortoisemerge gvimdiff diffuse ecmerge p4merge araxis emerge vimdiff
Merging the files: Testing/Data
mv: cannot stat `Testing/Data': No such file or directory
cp: cannot stat `./Testing/Data.BACKUP.5251': No such file or directory
error: git checkout-index: cannot create temporary subproject
error: git checkout-index: cannot create temporary subproject
Normal merge conflict for 'Testing/Data':
{local}: created
{remote}: created
Hit return to start merge resolution tool (gvimdiff):
3 files to edit
Testing/Data seems unchanged.
Was the merge successful? [y/n] y
fatal: unable to stat 'Testing/Data': No such file or directory
I guess this is a minor issue, but I thought I should report it here.
Thanks for this tool !
--
Mathieu
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: git submodule vs git mergetool
2011-01-18 9:04 git submodule vs git mergetool Mathieu Malaterre
@ 2011-01-19 18:40 ` Jens Lehmann
0 siblings, 0 replies; 2+ messages in thread
From: Jens Lehmann @ 2011-01-19 18:40 UTC (permalink / raw)
To: Mathieu Malaterre; +Cc: git
Am 18.01.2011 10:04, schrieb Mathieu Malaterre:
> $ git mergetool
> merge tool candidates: meld opendiff kdiff3 tkdiff xxdiff
> tortoisemerge gvimdiff diffuse ecmerge p4merge araxis emerge vimdiff
> Merging the files: Testing/Data
>
> mv: cannot stat `Testing/Data': No such file or directory
> cp: cannot stat `./Testing/Data.BACKUP.5251': No such file or directory
> error: git checkout-index: cannot create temporary subproject
> error: git checkout-index: cannot create temporary subproject
> Normal merge conflict for 'Testing/Data':
> {local}: created
> {remote}: created
> Hit return to start merge resolution tool (gvimdiff):
> 3 files to edit
> Testing/Data seems unchanged.
> Was the merge successful? [y/n] y
> fatal: unable to stat 'Testing/Data': No such file or directory
>
> I guess this is a minor issue, but I thought I should report it here.
I assume this happens when you do the merge in a work tree where this
submodule does not exist? Right now git does not populate submodules
that show up while switching branches or doing a merge. I am working
on that feature, but progress is not as swift as I hoped ...
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-19 18:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-18 9:04 git submodule vs git mergetool Mathieu Malaterre
2011-01-19 18:40 ` Jens Lehmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox