On Mon, Sep 25, 2017 at 5:32 PM, Andy Goth wrote:
> whatever was going on. Might want to explicitly turn on more warnings
> like -Wunused or -Wall or even -Wextra to help spot these types of issues.)
>
Sidebar: i tried -Wall with fossil years ago but it didn't like sqlite3's
use of "long long",
On 09/25/17 10:39, Richard Hipp wrote:
On 9/25/17, Andy Goth wrote:
As far as I can tell, in the general case I described in my previous
email, assuming waiting was not an option, the best to do would have
been to explicitly specify the -baseline option when merging the child
branch and later
On 9/25/17, Andy Goth wrote:
> As far as I can tell, in the general case I described in my previous
> email, assuming waiting was not an option, the best to do would have
> been to explicitly specify the -baseline option when merging the child
> branch and later when merging its parent branch. B
On 09/25/17 10:18, Richard Hipp wrote:
On 9/25/17, Andy Goth wrote:
In response to Chris Rydalch saying that search-technote works for him,
in combination with it passing all my tests, I'd like to merge it to trunk.
What is the correct procedure for doing so?
At this point I'm inclined to jus
On 9/25/17, Andy Goth wrote:
> In response to Chris Rydalch saying that search-technote works for him,
> in combination with it passing all my tests, I'd like to merge it to trunk.
>
> What is the correct procedure for doing so?
>
> At this point I'm inclined to just be patient and let
> annotatio
In response to Chris Rydalch saying that search-technote works for him,
in combination with it passing all my tests, I'd like to merge it to trunk.
What is the correct procedure for doing so?
If I do:
$ f up trunk
$ f merge search-technote -baseline root:search-technote -integrate
Then any fu
Thanks for all the answers.
Zoltan
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
need to use the merge command for this, in my view.
-Original Message-
From: Zoltán Kócsi
Sent: Wednesday, April 15, 2015 5:16 PM
To: Fossil SCM user's discussion
Subject: [fossil-users] Merge question
Is there a way to do that? That is, merge only a bunch of files
between two br
On 4/15/15, Zoltán Kócsi wrote:
> I want to merge *only* that particular set
> of files of the A branch to the B branch.
>
> Is there a way to do that?
There are several ways to do this.
Probably the best way is to designate one branch as the "main" branch.
(Let's call it A.) And let all other
Thus said =?UTF-8?B?Wm9sdMOhbiBLw7Njc2k=?= on Thu, 16 Apr 2015 00:16:11 +1000:
> Is there a way to do that? That is, merge only a bunch of files
> between two branches but leave everything else untouched on both
> branches (and of course still having two branches)? Note that there
Consider the following scenario:
Let's say I have two branches of a project, a version A and a version B
of a product (for example, they go to two different markets with
slightly different requirements or some other reason) but of course A
and B share a lot of common stuff. Or we can have a releas
11 matches
Mail list logo
