From: Alexander Litvinov <lan@ac-sw.com>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: What is in git.git
Date: Sat, 21 Jan 2006 16:36:02 +0600 [thread overview]
Message-ID: <200601211636.02340.lan@ac-sw.com> (raw)
In-Reply-To: <7v3bjiuhxb.fsf@assigned-by-dhcp.cox.net>
Somehow first mail was not reached the list, resending it.
> The "bind commit" experiments for subproject support is coming
> along rather nicely. Near the tip of the "pu" branch, there
> are:
...
>
> I think the first four are more-or-less well debugged.
>
> I am reasonably confident that I did not break rev-list for
> repositories without "bind" commits, but I have no clue how
> correct it is when dealing with commits with "bind" lines. This
> is the last major remaining piece of the puzzle, and the rest is
> just the matter of scripting. I'd be sending out a request for
> help on the rev-list in a separate message.
>
> There still is no barebone Porcelainish work done using these
> changes. The attached script demonstrates a superproject that
> binds two subprojects with their own development histories.
I tested this with your script. It works well. But I have found some
downsides.
subpro and main are separate projects and master is the join of them. If I
want to modify subpro I have to checkout subpro branch, edit files. When I
have to got to master and bind new version of subpro to it. Worse, if I will
edit subpro's files bined to master branch changes will go to master branch
instead of subpro's history. As a result all other project (imagine master-2)
that use subpro will lose this change.
1. Can I bind some branch instead of tag (commit) ?
2. Is it possible to commit changes of subpro's file in master branch into
subpro branch to make this changes visible to master-2 ?
Thanks for attention.
Alexander Litvinov.
next prev parent reply other threads:[~2006-01-21 10:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-21 8:03 What is in git.git Junio C Hamano
[not found] ` <200601211524.03096.lan@ac-sw.com>
2006-01-21 10:33 ` Alexander Litvinov
2006-01-21 10:36 ` Alexander Litvinov [this message]
2006-01-21 19:37 ` Junio C Hamano
2006-01-21 22:22 ` Junio C Hamano
2006-01-21 23:33 ` Josef Weidendorfer
2006-01-22 2:44 ` Junio C Hamano
2006-01-24 1:52 ` Josef Weidendorfer
2006-01-22 3:12 ` Petr Baudis
2006-01-22 17:53 ` Daniel Barkalow
2006-01-22 20:08 ` Junio C Hamano
2006-01-22 20:26 ` Daniel Barkalow
2006-01-22 20:35 ` Junio C Hamano
2006-01-22 20:41 ` Junio C Hamano
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=200601211636.02340.lan@ac-sw.com \
--to=lan@ac-sw.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).