Re: [fossil-users] Repairing trunk/timeline after a shun

2016-05-15 Thread Richard Hipp
On 5/15/16, Andy Goth wrote: > > To fix, you're going to have to go back to the version prior to the shun > and redo every check-in since that point. Another option is to "reparent" the first check-in after the shun such that it's parent becomes the last check-in before

Re: [fossil-users] Repairing trunk/timeline after a shun

2016-05-15 Thread Stephan Beal
On Mon, May 16, 2016 at 12:37 AM, John P. Rouillard < rouilj+fos...@cs.umb.edu> wrote: > Fortunately there are no artifact references in > tickets/wiki/comments. But if there was, would some SQL magic > be needed to find/change these references? > The SQL-usable parts of the repo are just a

Re: [fossil-users] Repairing trunk/timeline after a shun

2016-05-15 Thread Tony Papadimitriou
In case it applies to you, if you haven't rebuilt the repo since the mistake shunning, I believe you can un-shun what was shunned, and it should all come back to the way it was. On 5/14/2016 4:59 PM, John P. Rouillard wrote: I had to recently shun some artifacts from a fossil repo (due to

Re: [fossil-users] Repairing trunk/timeline after a shun

2016-05-15 Thread John P. Rouillard
Hi Andy: In message <5538e894-bdfa-ad31-be79-26383e8ea...@gmail.com>, Andy Goth writes: >On 5/14/2016 4:59 PM, John P. Rouillard wrote: >> I had to recently shun some artifacts from a fossil repo (due >> to embedded security credentials). Now when I look at the >> fossil timeline that spans that

Re: [fossil-users] Repairing trunk/timeline after a shun

2016-05-15 Thread Andy Goth
On 5/14/2016 4:59 PM, John P. Rouillard wrote: > I had to recently shun some artifacts from a fossil repo (due to > embedded security credentials). Now when I look at the fossil timeline > that spans that shunning I no longer have a single connected trunk. > > So is there some way to reintegrate