How to deal with mixed tree?

A project P1 is under Git.

A project P2 is under Subversion.

P2 in fact replace a sub-directory (say SD) in P1. The project P2 is a replacement (extension) of the code in P1.

How to deal with this?

If you clone P1, remove SD in P1 to replace it by P2:

   $ git diff

   -> will display all the changes in SD, is there a way to avoid that?

   $ git merge (between branches) will try to merge changes in SD

I'd like to really tell Git to ignore SD as if it was not there. Any solution?

Thanks, Pascal.

On 22.11.2011 12:21, Pascal Obry wrote:

Remove SD in P1, make a logical link from P2 to SD, add SD to .git/info/exclude

(see "Bug report - local (and git ignored) file silently removed after checkout" on the mailing list why exclude is better than .gitignore at the moment)

Holger,

Thanks for your quick reply. That's what I have tested but...

Seems like this is working only if file names are different. This is not my case as the replacement is very similar. With the following script I'm expecting empty status and no diff:

<< #!/bin/sh

# create sd (directory that will replace src2) mkdir sd echo sd1 > sd/file1 echo sd2 > sd/file2

# create Git repo mkdir repo cd repo git init mkdir src1 mkdir src2 echo file > src1/file echo 3 > src2/file3 git add . git ci -a -m "first"

# let's replace src2 by sd

rm -fr src2 # ln -s ../sd src2 cp -r ../sd src2

# make sure src2 is excluded

echo 'src2/*' >> .git/info/exclude

# the following output should be clean

echo '============== Status' git status

echo '============== Diff' git diff

But the output is actually:

Initialized empty Git repository in /home/obry/tmp/repo/.git/
[master (root-commit) 527c7a1] first
 2 files changed, 2 insertions(+), 0 deletions(-)
 create mode 100644 src1/file
 create mode 100644 src2/file3
cp: cannot stat `../src': No such file or directory
============== Status
# On branch master
# Changes not staged for commit:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working
directory)
#
#	deleted:    src2/file3
#
no changes added to commit (use "git add" and/or "git commit -a")
============== Diff

On 22.11.2011 15:20, Pascal Obry wrote:

You should also remove src2 and all files in it from the git repository. Something like

git rm -r src2 git ci echo 'src2' >> .git/info/exclude

instead of

rm -fr src2 echo 'src2/*' >> .git/info/exclude

Holger,

Thanks this is working indeed. But it was not the whole story :)

In fact I want to do that in a branch (say work) and keep master as-is as this branch is used to pull changes from origin. And in this case, doing 'git diff master' still shows the files under src2. See script to reproduce:

<< #!/bin/sh

# create sd (directory that will replace src2) mkdir sd echo sd1 > sd/file1 echo sd2 > sd/file2

# create Git repo mkdir repo cd repo git init mkdir src1 mkdir src2 echo file > src1/file echo 3 > src2/file3 git add . git ci -a -m "first"

# let's replace src2 by sd in branch work

git checkout -b work git rm src2/* git ci -m "no more src2" # ln -s ../sd src2 cp -r ../sd src2

# make sure src2 is excluded

echo 'src2' >> .git/info/exclude

# the following output should be clean

echo '============== Status' git status

echo '============== Diff' git diff

echo '============== Diff master' git diff master

Is that possible?

On 22.11.2011 16:21, Pascal Obry wrote:

[...]

In my not-really-expert opinion no. At least git diff master has to show something because there obviously is a difference between what is in master (that you can't gitignore) and your branch (whether you ignore it or not).

I would

a) use a different directory name for src2 and adapt the Makefile to cope with that

or

b) remove the src2 link from .git/info/exclude and commit it into the branch. That way whenever you switch branch and master, the correct dir or link will be present and still because of the link none of the files in the svn will be handled by git in any way

Holger,

I had come to the same conclusion. Sad, it would have been nice to have an option to fully ignore a path in a repository.

Anyway, thanks a lot for your feedback.

Pascal.

Holger Hellmuth <hellmuth@ira.uka.de> writes:

Don't look at it or encourage people to rely on that bug to be fixed. exclude and .gitignore should behave the same way.