From: Bert Wesarg <bert.wesarg@googlemail.com>
To: Ira Weiny <weiny2@llnl.gov>
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Brian Behlendorf" <behlendorf1@llnl.gov>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: [PATCH] Add "list" and "rm" sub commands to tg-depend
Date: Thu, 9 Apr 2009 20:01:04 +0200 [thread overview]
Message-ID: <36ca99e90904091101l6dd1685y5be70dd77bf52b57@mail.gmail.com> (raw)
In-Reply-To: <20090409091021.5a7ded79.weiny2@llnl.gov>
2009/4/9 Ira Weiny <weiny2@llnl.gov>:
> On Thu, 9 Apr 2009 14:43:37 +0200
> Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
>> You might want to check
>>
>> http:// thread.gmane.org/gmane.comp.version-control.git/114581
>
> Ah this brings up more issues I had not thought about... :-( But perhaps
> Bert's work could be used to help implement "rm". Thoughts?
No, it wont help. Because the base and tip of the topic should not
changed in respect to the old state (expect for .topdeps of course).
If you really want to remove a dependency, you need to revert a merge
of this dep from the topic base. which is not possible today, or maybe
I have just an idea for this:
'topic': the topic
'base': the base of the topic, i.e. a merge from all dependent
topics dep0, ..., depN
say you want to remove dep0
1) merge all deps dep1, ..,depN into 'new-base'
2) merge 'new-base' into base with the merge driver 'theirs', that
would overwrite all changes from dep0 in the 'base'
3) update 'topic' to the updated 'base'
Any thoughts from someone who knows more than me?
Bert
> Thanks,
> Ira
next prev parent reply other threads:[~2009-04-09 18:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20090407133329.57b06727.weiny2@llnl.gov>
[not found] ` <20090408080824.GF8940@machine.or.cz>
[not found] ` <20090408083955.GA28482@pengutronix.de>
[not found] ` <20090408091949.8a648d83.weiny2@llnl.gov>
[not found] ` <20090409124337.GA6034@pengutronix.de>
2009-04-09 17:34 ` [PATCH] Add "list" and "rm" sub commands to tg-depend Bert Wesarg
2009-04-09 18:18 ` Ira Weiny
[not found] ` <20090409091021.5a7ded79.weiny2@llnl.gov>
2009-04-09 18:01 ` Bert Wesarg [this message]
2009-04-09 20:15 ` Uwe Kleine-König
2009-04-11 15:40 ` Bert Wesarg
2009-04-11 19:06 ` Uwe Kleine-König
2009-04-11 19:29 ` Bert Wesarg
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=36ca99e90904091101l6dd1685y5be70dd77bf52b57@mail.gmail.com \
--to=bert.wesarg@googlemail.com \
--cc=behlendorf1@llnl.gov \
--cc=git@vger.kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
--cc=weiny2@llnl.gov \
/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).