Hello.
1) I created a private branch, made several commits, and then merged the
private branch with the current trunk. Rather than seeing the commits
I made on the private branch in the timeline for the trunk, I only see
the one large commit resulting from accumulating all the smaller commits
On Fri, May 25, 2012 at 11:42 AM, org.fossil-scm.fossil-us...@io7m.comwrote:
Hello.
1) I created a private branch, made several commits, and then merged the
private branch with the current trunk. Rather than seeing the commits
I made on the private branch in the timeline for the trunk, I
On Fri, 25 May 2012 11:53:35 -0400
Richard Hipp d...@sqlite.org wrote:
On Fri, May 25, 2012 at 11:42 AM,
org.fossil-scm.fossil-us...@io7m.comwrote:
Is it possible to avoid squashing all private commits into one?
The branch is private. If all the individual commits where pushed
out to
On Fri, 25 May 2012 16:10:44 +
org.fossil-scm.fossil-us...@io7m.com wrote:
On Fri, 25 May 2012 11:53:35 -0400
Richard Hipp d...@sqlite.org wrote:
On Fri, May 25, 2012 at 11:42 AM,
org.fossil-scm.fossil-us...@io7m.comwrote:
Is it possible to avoid squashing all private commits into
On Fri, May 25, 2012 at 9:10 AM, org.fossil-scm.fossil-us...@io7m.comwrote:
On Fri, 25 May 2012 11:53:35 -0400
Richard Hipp d...@sqlite.org wrote:
On Fri, May 25, 2012 at 11:42 AM,
org.fossil-scm.fossil-us...@io7m.comwrote:
Is it possible to avoid squashing all private commits into one?
On Fri, 25 May 2012 10:18:34 -0700
Matt Welland estifo...@gmail.com wrote:
On Fri, May 25, 2012 at 9:10 AM,
org.fossil-scm.fossil-us...@io7m.comwrote:
On Fri, 25 May 2012 11:53:35 -0400
Richard Hipp d...@sqlite.org wrote:
On Fri, May 25, 2012 at 11:42 AM,
On Fri, May 25, 2012 at 1:09 PM, org.fossil-scm.fossil-us...@io7m.comwrote:
On Fri, 25 May 2012 16:10:44 +
org.fossil-scm.fossil-us...@io7m.com wrote:
On Fri, 25 May 2012 11:53:35 -0400
Richard Hipp d...@sqlite.org wrote:
On Fri, May 25, 2012 at 11:42 AM,
On Fri, 25 May 2012 13:34:54 -0400
Richard Hipp d...@sqlite.org wrote:
I don't think so, not other than checking each one out and
recommitting them one by one. To do otherwise would be changing the
history of the project, which Fossil does not allow (by design).
That's fine.
Which commands
On Fri, May 25, 2012 at 01:34:54PM -0400, Richard Hipp wrote:
On Fri, May 25, 2012 at 1:09 PM, org.fossil-scm.fossil-us...@io7m.comwrote:
On Fri, 25 May 2012 16:10:44 +
org.fossil-scm.fossil-us...@io7m.com wrote:
On Fri, 25 May 2012 11:53:35 -0400
Richard Hipp d...@sqlite.org
On Fri, May 25, 2012 at 01:49:06PM -0400, Richard Hipp wrote:
On Fri, May 25, 2012 at 1:42 PM, Lluís Batlle i Rossell
vi...@viric.namewrote:
I don't think so, not other than checking each one out and recommitting
them one by one. To do otherwise would be changing the history of the
On Fri, May 25, 2012 at 1:51 PM, Lluís Batlle i Rossell vi...@viric.namewrote:
On Fri, May 25, 2012 at 01:49:06PM -0400, Richard Hipp wrote:
On Fri, May 25, 2012 at 1:42 PM, Lluís Batlle i Rossell
vi...@viric.namewrote:
I don't think so, not other than checking each one out and
On Fri, May 25, 2012 at 01:53:23PM -0400, Richard Hipp wrote:
On Fri, May 25, 2012 at 1:51 PM, Lluís Batlle i Rossell
vi...@viric.namewrote:
Ah, I thought that branches could be made back public easily. I never used
privated branches still, so I have zero practise with them.
As for the
On 05/25/2012 11:10 AM, org.fossil-scm.fossil-us...@io7m.com wrote:
That's one interpretation of private, yes. I took it to mean that the
branch wouldn't be synced, or visible, on any remotes. I don't think
that necessarily implies coalescing commits like that... If it's not
possible, I can
On Fri, May 25, 2012 at 12:26 PM, Nolan Darilek no...@thewordnerd.info wrote:
Shame, I actually kind of liked that individual commits were preserved.
Squashing and such was part of why I left Git. History should be preserved,
whether you are working alone in private or in the open.
History is
On Fri, 25 May 2012 17:41:44 +
org.fossil-scm.fossil-us...@io7m.com wrote:
On Fri, 25 May 2012 13:34:54 -0400
Richard Hipp d...@sqlite.org wrote:
I don't think so, not other than checking each one out and
recommitting them one by one. To do otherwise would be changing the
history
So, clearly, I just need to revisit the whole private branch concept
As originally implemented, private branches were just a marking in the
database. But then somebody (aku?) pointed out that if you export and
reimport the database, the private markings are lost, since database
entries are
On 5/25/2012 12:28 PM, Richard Hipp wrote:
So, clearly, I just need to revisit the whole private branch concept
As originally implemented, private branches were just a marking in the
database. But then somebody (aku?)
While I don't remember that, it would certainly be in my line of
On Fri, 25 May 2012 15:28:02 -0400
Richard Hipp d...@sqlite.org wrote:
So perhaps we should go back to the original design?
As far as private branches are concerned, I'd like to be able to
selectively rm single private branch when using 'scrub'.
Otoh, Mercurial has nice concept of Phases
18 matches
Mail list logo