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 your local changes and b) screws up > history (i.e. logs and annotate). I usually keep anything that could be > described as "local adjustments" private and the upstream clean of such > adjustments.
Exactly why this isn't a great technique. And why I'll conditionally include a local, not-checked-in, file. Even though it'll cause complications with multiple workspaces -- having to copy the local mods separately from checkout. -- hendrik _______________________________________________ Monotone-devel mailing list [email protected] https://lists.nongnu.org/mailman/listinfo/monotone-devel
