[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Axiom-developer] .svn recursive copying bug
From: |
Ralf Hemmecke |
Subject: |
Re: [Axiom-developer] .svn recursive copying bug |
Date: |
Sun, 02 Jul 2006 22:26:44 +0200 |
User-agent: |
Thunderbird 1.5.0.4 (X11/20060516) |
Hello Tim, hello Gaby,
I am a bit confused now, Why do we have the silver branch if all goes
immediately to Tim's private gold branch? Shouldn't we have the policy
that a patch is sent to silver then it needs someone to approve and then
Tim could easily extract it from the silver branch (even together with
the svn log and/or ChangeLog).
For this simple modification of the TWO files
Makefile.pamphlet and
src/scripts/Makefile.pamphlet
it is perhaps not a big modification so that I could commit it directly
to the trunk. But, Gaby, what is the general rule (for someone who has
write access to Silver)?
Would that be as follows?
1) open up a new branch
2) make modifications (fix bugs or whatever)
3) announce the bugfix to the list
4) wait for approval of some other axiom-developer
5) someone (who?) merges the changes back to the trunk
6) Tim could extract modifications to his private Gold-branch
Would that be a reasonable policy? In fact, I would be happy if I could
find such a policy somewhere on the wiki. In particular, I would like
just to do one single 'diff -Naur', but that seems to force me to have
an extra unmodified branch on my harddisk.
I am not for any SCM war I am just eager to learn about maintaining big
projects. In particular for Axiom, submitting patches that apply to
several files should be made simpler. It should be allowed to simply
commit to a branch at Axiom silver.
Ralf
On 07/02/2006 10:13 PM, Gabriel Dos Reis wrote:
root <address@hidden> writes:
| seems reasonable.
| could you please do:
|
| diff -Naur Makefile.original Makefile.new
|
| and post the results. That way I won't miss any changes. --Tim
In case it is approved by Tim, please apply it to silver branch, with
entry the appropriate ChangeLog.
-- Gaby