sm-grimoire AT lists.ibiblio.org
Subject: Discussion of Spells and Grimoire items
List archive
- From: Tony Smith <tony AT smee.org>
- To: Hamish Greig <hgreig AT bigpond.net.au>, Grimoire <sm-grimoire AT lists.ibiblio.org>
- Cc:
- Subject: Re: [SM-Grimoire] Smaller devel grimoire
- Date: Wed, 17 Sep 2003 18:03:08 +0100
On Wednesday 17 September 2003 3:16 pm, Hamish Greig wrote:
> On Wed, 17 Sep 2003 21:29, Tony Smith wrote:
> > Nice idea, but it's going to make things very difficult to manage...
> >
> > What happens when the devel version is integrated into test? Are you
> > proposing to delete it from devel? If so you're about to cause a lot of
> > hassle for the test/stable maintainers.
>
> Two quick questions Tony
> 1) if a spell is added in devel, worked on, then /integrated/ to test, then
> the devel version is deleted won't the test version keep all the previous
> revision history ?
Yes, but the next time you try to edit that spell in devel you have to add it
again and then when you come to integrate that change into test, Perforce
(rightly) sees it as an entirely new file that just happens to have the same
name as an old one and doesn't consider any previous integration history
between the two files. Hello baseless merge...
> 2) For spells already in test that we have copied into devel to rewrite/
> whatever can't we just use p4 edit and then copy the files back into test
> when we are ready ? the files get updated to the newer version but keep all
> previous revision history (from test) ? Or not ? The history from the
> rewrite is of little concern to me as i would like to see more ###
> commenting in the spells and more descriptive HISTORY entries.
> If these two points are good then devel would truly be just a "branch" of
> test for work in progress ( like someone mentioned last week)
> maybe a quick third point :)
Basically you can't have it both ways. Either devel is a branch of test and
is
maintained in a way that is compatible with the maintenance of test, or devel
is an entirely separate codeline. If you treat devel/test as separate
unrelatated codelines, then yes, you can "p4 edit" and copy files across to
propagate changes, but you're just making a process that was automatic
manual. The onus is now on you to track what has been copied over and what
hasn't. In that case, I wish you luck - you'll need it.
If "p4 sync" is taking too long, then first make sure you're using the
"compress" client option (run "p4 client"). Many people are not using that
and it makes a big difference.
> If cvs syncing will trample all over our revision history anyway, why go
> out of our way to save it just to lose it later ?
What makes you think a CVS sync will do that? I'm not a fan of trashing
history, so I would do my best to avoid it in a sync.
Tony
-
Re: [SM-Grimoire] Smaller devel grimoire
, (continued)
-
Re: [SM-Grimoire] Smaller devel grimoire,
Sergey A. Lipnevich, 09/17/2003
-
Re: [SM-Grimoire] Smaller devel grimoire,
Eric Sandall, 09/17/2003
- Re: [SM-Grimoire] Smaller devel grimoire, Ladislav Hagara, 09/17/2003
-
Re: [SM-Grimoire] Smaller devel grimoire,
Eric Sandall, 09/17/2003
-
Re: [SM-Grimoire] Smaller devel grimoire,
Arwed von Merkatz, 09/17/2003
-
Re: [SM-Grimoire] Smaller devel grimoire,
Seth Woolley, 09/17/2003
- Re: [SM-Grimoire] Smaller devel grimoire, Christoph Steckelberg, 09/17/2003
-
Re: [SM-Grimoire] Smaller devel grimoire,
Tony Smith, 09/17/2003
-
Re: [SM-Grimoire] Smaller devel grimoire,
Arwed von Merkatz, 09/17/2003
- Re: [SM-Grimoire] Smaller devel grimoire, Tony Smith, 09/17/2003
-
Re: [SM-Grimoire] Smaller devel grimoire,
Hamish Greig, 09/17/2003
- Re: [SM-Grimoire] Smaller devel grimoire, Tony Smith, 09/17/2003
- Re: [SM-Grimoire] Smaller devel grimoire, Hamish Greig, 09/17/2003
- Re: [SM-Grimoire] Smaller devel grimoire, Tony Smith, 09/18/2003
- Re: [SM-Grimoire] Smaller devel grimoire, Eric Sandall, 09/18/2003
-
Re: [SM-Grimoire] Smaller devel grimoire,
Arwed von Merkatz, 09/17/2003
-
Re: [SM-Grimoire] Smaller devel grimoire,
Seth Woolley, 09/17/2003
-
Re: [SM-Grimoire] Smaller devel grimoire,
Sergey A. Lipnevich, 09/17/2003
-
Re: [SM-Grimoire] Smaller devel grimoire,
Eric Sandall, 09/16/2003
- Re: [SM-Grimoire] Smaller devel grimoire, Hamish Greig, 09/16/2003
Archive powered by MHonArc 2.6.24.