All of lore.kernel.org
 help / color / mirror / Atom feed
From: Manuel Reimer <Manuel.Spam@nurfuerspam.de>
To: git@vger.kernel.org
Subject: Re: Where is information of "git read-tree" stored?
Date: Mon, 19 Sep 2011 21:52:10 +0200	[thread overview]
Message-ID: <j586pb$emh$1@dough.gmane.org> (raw)
In-Reply-To: <7vzki0a0yd.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:
> It is unclear to me what you meant by "connection" "lost" and "recreated"
> above, but I am guessing I can ignore them, as long as I take it that you
> mean by that local mirror from the subversion repository "Bproject" below.

Yes. And the reference to it isn't pushed to the remote GIT server. If I clone 
the remote repo, then "git remote -v" doesn't show the reference anymore.

> That "how to" may be badly written and this may have been unclear to you
> but the first four steps are to be done _only once_ to set things up, and
> after that you need to run only the fifth step whenever you want to update
> from the Bproject. Could you suggest a better wording to update the doc?

As long as I don't understand what's going on here, I can't suggest how to 
improve the documentation.

> The very first "subtree merge" (the one that is recorded with the commit
> after the read-tree) records all paths from Bproject renamed to elsewhere
> in the merge result (you can view it with "git show -M
> $that_merge_commit")

Tried that, but the stuff, I saw on screen, doesn't make clear how GIT knew 
about what to do here.

I also still don't know how I can restore that whole setup if anything, I have 
on my local side, gets lost. Means, that anything, that I have left, is the 
stuff, I pushed to the remote GIT and the SVN, I want to have in my own tree. 
Which steps do I have to perform to restore the setup and have it working again 
without getting conflicts?

Maybe the risk of getting problems is too high and I should copy over stuff, I 
got from SVN, from time to time manually to my GIT repo?

Yours

Manuel

  reply	other threads:[~2011-09-19 19:56 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-19  8:46 Where is information of "git read-tree" stored? Manuel Reimer
2011-09-19 17:36 ` Junio C Hamano
2011-09-19 19:52   ` Manuel Reimer [this message]
2011-09-19 22:09     ` Junio C Hamano
2011-09-25  1:30       ` David Aguilar

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='j586pb$emh$1@dough.gmane.org' \
    --to=manuel.spam@nurfuerspam.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

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

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.