On Mon, Aug 19, 2013 at 02:48:51PM +0200, Markus Wanner wrote:
> On 08/16/2013 10:18 AM, Stephen Leake wrote:
> > You could do it manually with the following steps:
> >
> > - generate a diff file containing the changeset.
> >
> > - propagate from local to main
>
> Remember that this a) reveals y
On 08/16/2013 10:18 AM, Stephen Leake wrote:
> You could do it manually with the following steps:
>
> - generate a diff file containing the changeset.
>
> - propagate from local to main
Remember that this a) reveals your local changes and b) screws up
history (i.e. logs and annotate). I usually
Hendrik Boom writes:
> Is there any way to mark this one changeset so that it will never be
> merged into the main branch?
This is not possible with the current monotone.
It has come up in other contexts; the Emacs developers would like the
capability. (If we implement it, they just might swi
On 08/15/2013 02:52 PM, Hendrik Boom wrote:
> Well, this is more or less what I considered, but local-devel isn't all
> that easy to do without the local-adjust being applied during testing.
> And as for editing in the local-adjust during testing and editing it
> out befure commit, well, that's b
On Thu, Aug 15, 2013 at 10:04:52AM +0200, Markus Wanner wrote:
> On 08/15/2013 02:22 AM, Hendrik Boom wrote:
> > II sometimes have to adapt a package to local conditions -- the most
> > common kind of change is a configuration changem such as specifying where
> > it is to be installed.
> >
> > N
On 08/15/2013 02:22 AM, Hendrik Boom wrote:
> II sometimes have to adapt a package to local conditions -- the most
> common kind of change is a configuration changem such as specifying where
> it is to be installed.
>
> Now the obvious (and possibly wrong) is to make a local branch, make this
>
II sometimes have to adapt a package to local conditions -- the most
common kind of change is a configuration changem such as specifying where
it is to be installed.
Now the obvious (and possibly wrong) is to make a local branch, make this
change and propagate changes from the main branch into
