public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Jakub Narebski <jnareb@gmail•com>
To: outre <spoony.sob@hotmail•com>
Cc: git@vger•kernel.org
Subject: Re: lineups with GIT (or dealing with directory renames)
Date: Fri, 23 Jan 2009 09:25:30 -0800 (PST)	[thread overview]
Message-ID: <m3mydix7bq.fsf@localhost.localdomain> (raw)
In-Reply-To: <1232610882661-2196604.post@n2.nabble.com>

outre <spoony.sob@hotmail•com> writes:

[...]
> I tried using "git mv" command and it somewhat solved the problem. After I
> cloned the devel line-up, I used "git rm iWeb.local iWeb.test".
> And now if I edit a file in iWeb.local and do a pull to iWeb.test this file
> gets properly updated while preserving the difference between
> the folder names. But if I add a new file to iWeb.local, and then do a pull
> I get  iWeb.local folder added together with the 
> new file to the testing line-up.
> 
> I was wondering if it is intended behaviour for GIT. And if it is may be
> someone can point me to a better way to setup two line-ups using
> GIT.

I know nothing about line-ups, but the behaviour wrt. wholesame
directory renames is _known_ behavior of git. If one side renames
directory, and other side creates new files in old-name directory,
the old-name directory gets recreated during merging.

I wrote _known_ and not _intendend_ because this can be changed;
there were some patches on git mailing list (I don't know what
happened to them; I think the development stalled) that added
detecting wholesame rename of directories, based on heuristic
content and filename similarity based detection of renames for
individual files.

-- 
Jakub Narebski
Poland
ShadeHawk on #git

next prev parent reply	other threads:[~2009-01-23 17:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-22  7:54 lineups with GIT outre
2009-01-23 17:25 ` Jakub Narebski [this message]
2009-01-23 18:01 ` Daniel Barkalow

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=m3mydix7bq.fsf@localhost.localdomain \
    --to=jnareb@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=spoony.sob@hotmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox