what do I need to learn to do this task?

[Justinas Urbanavicius]

you can push and pull between your laptop and your desktop, without the
bitbucket server. Although this won't eliminate long list of commits it
will prevent unfinished work to get out to the main server.

you could try the following workflow
mercurial has an integrated server just run hg serve
in your repository on desktop .hg/hgrc define a path laptop =
http://your_laptop_ip:8000/

do the same on your laptop, but at the path to your desktop =
http://your_desktop_ip:8000/

when you want to switch to laptop from desktop commit changes and run "hg
push laptop" (the hg serve needs to be running, you can use hg serve -b to
run it in background, if you switch a lot, but not recommended especially
if you plan to work outside the office) and the changes will be pushed to
your repository on a laptop. the same goes when switching back to desktop,
i think you get the picture.

if you run hg push (or hg push default) it will push to the main server you
cloned the repository from, so when you done your work and ready to share
with co worker just push to the main server.


On Tue, May 13, 2014 at 6:28 AM, Michael Mossey <michaelmossey at gmail.com>wrote:

>
>
>
> On Mon, May 12, 2014 at 7:08 PM, Adrian Klaver <adrian.klaver at aklaver.com>wrote:
>
>> On 05/12/2014 06:17 PM, Michael Mossey wrote:
>>
>>> I'm new to Mercurial and I don't have a lot of time to devote to
>>> learning it (or any SCM system) in great detail, nor do I need to, so I
>>> am wondering if I could get some guidance about the specific things I
>>> need to do this task:
>>>
>>> My workflow will look something like this:
>>>
>>> (1) I'll check out a copy of the main Bitbucket repo
>>> (2) I'll work on my laptop
>>> (3) I'll be ready to switch to my desktop, so I'll commit changes
>>> (3) I'll push changes to some kind of secondary Bitbucket repo
>>> (4) I'll get on my desktop and pull those changes, and work
>>> (5) Get ready to switch to laptop; commit changes and push to secondary
>>> BB repo again
>>> (6) Continue, creating possibly a dozen small meaningless changesets
>>> until ready to commit a feature or intermediate feature to main BB repo
>>> (7) here's the trick I don't understand--somehow push and/or merge my
>>> changes with the main BB repo, hopefully without pushing a bunch of
>>> meaningless changesets onto it
>>>
>>> So basically I'm wondering how to structure things so I can do (7)
>>>
>>
>> Well I avoid the whole issue by using Unison (http://www.cis.upenn.edu/~
>> bcpierce/unison/) for the middle part. Basically you want the
>> laptop/desktop to be the same machine and then push/pull from Bitbucket. I
>> just do work on either my laptop or desktop and the use Unison to sync with
>> an EC2 instance. I then sync from that to the other machine. So:
>>
>>    ->   EC2 < -
>>    |            |
>>   \/           \/
>> laptop          desktop
>>
>> This way I do not have to commit until I want to and then push/pull to
>> Bitbucket.
>>
>
>
> I don't think this is going to work for me as I have no access to a server
> to run Unison.
>
> And, I still want to use Mercurial to do this because I think it's a good
> use case for familiarizing myself with Mercurial basics.
>
> Mike
>
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>
>


-- 
Justinas
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140513/a17041dd/attachment-0002.html>