I have two directories (on the same server) that have the same code
(apart from some recent changes in them).
One was created by cloning a repo (it has a test copy). I use fossil to
sync it with my local dev copy.
The other was not (I created that long before I started using fossil).
That is the
I just did a fossil merge $BRANCH for some changes that a colleague
checked in, and was puzzled to not see much change in the code. After I
while, I finally figured out that I should have do fossil pull first. :-\
I wonder if we should auto-pull before merge the same as we do before
update?
--
On Thu, Oct 9, 2014 at 10:18 PM, j. v. d. hoff veedeeh...@googlemail.com
wrote:
my first reaction would be: no. I feel that when issuing `merge' it
should
That's also my gut reaction. Optionally, sure, but if so then off by
default.
--
- stephan beal
On 10/9/2014 12:18 PM, Graeme Pietersz wrote:
I also need to keep data files unchanged, but as they are not in
fossil, they should be OK (Fossil should not delete these as long as
I do not run fossil clean, right?).
As you would expect, files not known to fossil will not be touched at
Thanks for the answer Ross, I did notice the --keep option and
understand that it means files are not changed. Does your answer imply
that then doing fossil update will update only the changed files?
fossil help open tells me that No files other than manifest
and manifest.uuid are modified if the
On Thu, Oct 9, 2014 at 9:18 PM, Graeme Pietersz gra...@pietersz.net wrote:
I have two directories (on the same server) that have the same code
(apart from some recent changes in them).
One was created by cloning a repo (it has a test copy). I use fossil to
sync it with my local dev copy.
On Thu, Oct 9, 2014 at 10:45 PM, Graeme Pietersz gra...@pietersz.net
wrote:
Thanks for the answer Ross, I did notice the --keep option and
understand that it means files are not changed. Does your answer imply
that then doing fossil update will update only the changed files?
No: open --keep
I've been mildly bitten by this behavior before. When merging from a branch
a warning that you haven't sync'd would be a nice to have. Autosync prior
to merge would work for me but the warning would be a decent alternative.
On Thu, Oct 9, 2014 at 12:43 PM, Richard Hipp d...@sqlite.org wrote:
I
8 matches
Mail list logo
