"Nuno Lucas" <[EMAIL PROTECTED]> writes:
> I have 2 branches with a common ancestor, but during some time they
> were apart and some renames, drops and adds were made. Now the 2
> branches are identical because the contents was generalized to
> accommodate both cases.
>
> Because of the renames, a
On Feb 11, 2008 8:18 PM, Julio M. Merino Vidal <[EMAIL PROTECTED]> wrote:
> Not really answering your question but... if the two are identical,
> why do you want to merge them? You can just suspend one of the two
> and continue working on the other.
"suspend" is a too recent feature. Besides not
On Mon, Feb 11, 2008 at 2:08 PM, Richard Levitte <[EMAIL PROTECTED]> wrote:
> zackw> Before a release we should pick up pcre 7.6, which has some
> zackw> security bugfixes in it.
>
> Good point, are you up for it?
Yeah, I should have time to do that this evening or tomorrow.
zw
_
On Feb 11, 2008, at 7:45 PM, Nuno Lucas wrote:
I have 2 branches with a common ancestor, but during some time they
were apart and some renames, drops and adds were made. Now the 2
branches are identical because the contents was generalized to
accommodate both cases.
Because of the renames, add'
In message <[EMAIL PROTECTED]> on Mon, 11 Feb 2008 09:32:27 -0500, "Zack
Weinberg" <[EMAIL PROTECTED]> said:
zackw> Before a release we should pick up pcre 7.6, which has some
zackw> security bugfixes in it. I don't think we're vulnerable as we
zackw> never use UTF-8 mode, but it would be best t
I have 2 branches with a common ancestor, but during some time they
were apart and some renames, drops and adds were made. Now the 2
branches are identical because the contents was generalized to
accommodate both cases.
Because of the renames, add's and drops, propagate fails with "rename
target c
On Feb 10, 2008 10:57 PM, Markus Schiltknecht <[EMAIL PROTECTED]> wrote:
> Nuno Lucas wrote:
> > In this case you could say they are modules, but it could be a single
> > file on the source tree, with no clear separation between it and other
> > source files. You can't have a branch per source file
"Nuno Lucas" <[EMAIL PROTECTED]> writes:
> On Feb 9, 2008 11:47 AM, Bruce Stephens <[EMAIL PROTECTED]> wrote:
[...]
>> git bisect has no connection to cherry-picking, as far as I know. git
>> bisect is just a scripted way to do "git checkout" for a sequence of
>> revisions.
>
> I stand correcte
On Feb 11, 2008 9:09 AM, Daniel THOMPSON <[EMAIL PROTECTED]> wrote:
> Nuno Lucas wrote:
> >>> Probably this will be solved when monotone gets a proper "cherry pick"
> >>> system. It would then be possible to "pluck" some group of revisions
> >>> (that could be restricted by path) and retain history
On Feb 9, 2008 11:47 AM, Bruce Stephens <[EMAIL PROTECTED]> wrote:
> "Nuno Lucas" <[EMAIL PROTECTED]> writes:
>
> [...]
>
> > An extreme example of "cherry picking" is git bissect command. You
> > could have the some functionality on monotone if people could also
> > "unpluck" a changeset.
>
> git
Before a release we should pick up pcre 7.6, which has some security
bugfixes in it. I don't think we're vulnerable as we never use UTF-8
mode, but it would be best to avoid potential worries.
zw
___
Monotone-devel mailing list
Monotone-devel@nongnu.o
Richard Levitte schrieb:
Please, take a look at your translation and update if needed. The
current status is as follows on my machine (fresh pull and update):
fr.po: 753 translated messages, 180 fuzzy translations, 181 untranslated
messages.
ja.po: 592 translated messages, 243 fuzzy translatio
Hi,
I'm setting aside time on friday to release monotone 0.39.
Please, take a look at NEWS and update if needed.
Please, take a look at your translation and update if needed. The
current status is as follows on my machine (fresh pull and update):
fr.po: 753 translated messages, 180 fuzzy trans
In message <[EMAIL PROTECTED]> on Wed, 06 Feb 2008 13:54:42 +0100, Koen Kooi
<[EMAIL PROTECTED]> said:
koen> -BEGIN PGP SIGNED MESSAGE-
koen> Hash: SHA1
koen>
koen> Markus Schiltknecht schreef:
koen> | I'd personally vote for a release this week. If Zack considers nvm.e.e
koen> | mature
Nuno Lucas wrote:
>>> Probably this will be solved when monotone gets a proper "cherry pick"
>>> system. It would then be possible to "pluck" some group of revisions
>>> (that could be restricted by path) and retain history.
>> I'm not exactly sure what you have in mind for being a "proper cherry
>
15 matches
Mail list logo
