pijul_org / pijul

#225 Pijul branches won't allow to checkout other branch.

Opened by raichoo, on November 15, 2017
Bug
pijul-0.9
Closed
raichoo commented on November 15, 2017

I've tried out branches and I get this kind of behavior. Am I misunderstanding something about the concept of branches in pijul?

⟦INSERT⟧:raichoo@lain:pijultest» pijul init                           ⟦21:55:33⟧
⟦INSERT⟧:raichoo@lain:pijultest» echo foo >> blafasel.txt             ⟦21:55:36⟧
⟦INSERT⟧:raichoo@lain:pijultest» pijul add blafasel.txt               ⟦21:55:41⟧
⟦INSERT⟧:raichoo@lain:pijultest» pijul record                         ⟦21:55:43⟧
added file /tmp/pijultest/blafasel.txt

Shall I record this change? (1/2) [ynkad] y

In file "/tmp/pijultest/blafasel.txt"

+ foo

Shall I record this change? (2/2) [ynkad] y

What is the name of this patch? first patch
Recorded patch 8dyb9ma3G4hRsG9Pvn7pmnzgNHJSYeaiFhMst4sNytNsRxaXgzv3ZXvJ6DLrQaA6iyTYMQhZiZ8ghL7pnvqpfQGK
⟦INSERT⟧:raichoo@lain:pijultest» echo foo >> blafasel.txt             ⟦21:55:59⟧
⟦INSERT⟧:raichoo@lain:pijultest» pijul record                         ⟦21:56:02⟧
In file "/tmp/pijultest/blafasel.txt"

+ foo

Shall I record this change? (1/1) [ynkad] y

What is the name of this patch? second patch
Recorded patch 6HTFxYW3dA5x7fbrAehYdiqNLKiQDX1GqPC6QXLPHNpgz2coC9abxLswfTvnGEujdZ2PMaPSKvoswfe7Gh1hDBi8
⟦INSERT⟧:raichoo@lain:pijultest» pijul fork test                      ⟦21:56:18⟧
⟦INSERT⟧:raichoo@lain:pijultest» pijul checkout test                  ⟦21:56:30⟧
Current branch: "test"
⟦INSERT⟧:raichoo@lain:pijultest» pijul unrecord                       ⟦21:56:36⟧
Hash: 6HTFxYW3dA5x7fbrAehYdiqNLKiQDX1GqPC6QXLPHNpgz2coC9abxLswfTvnGEujdZ2PMaPSKvoswfe7Gh1hDBi8
Internal id: 2PG6qUkp83v
Authors: ["raichoo@googlemail.com"]
Timestamp: 2017-11-15 20:56:11.017736852 UTC

    second patch

Shall I unrecord this patch? [ynkad] y
Hash: 8dyb9ma3G4hRsG9Pvn7pmnzgNHJSYeaiFhMst4sNytNsRxaXgzv3ZXvJ6DLrQaA6iyTYMQhZiZ8ghL7pnvqpfQGK
Internal id: N5Qo4FLzgMC
Authors: ["raichoo@googlemail.com"]
Timestamp: 2017-11-15 20:55:48.970830644 UTC

    first patch

Shall I unrecord this patch? [ynkad] n
⟦INSERT⟧:raichoo@lain:pijultest» pijul status                         ⟦21:56:45⟧

Changes not yet recorded:
  (use "pijul record ..." to record a new patch)

        modified:  blafasel.txt
⟦INSERT⟧:raichoo@lain:pijultest» pijul revert                         ⟦21:56:53⟧
In file "/tmp/pijultest/blafasel.txt"

+ foo

Shall I revert this change? (1/1) [ynkad] y

⟦INSERT⟧:raichoo@lain:pijultest» pijul checkout master                ⟦21:57:00⟧
error: There are pending changes in the repository. You need to revert or record them if you want to continue.
⟦INSERT⟧:raichoo@lain:pijultest» pijul status                         ⟦21:57:06⟧
Nothing to record, working tree clean
lthms commented on November 15, 2017

Thanks! So, as you described in IRC, the issue occures only for “smaller” branches.

lthms added tag
pijul-0.9
on November 18, 2017
lthms commented on November 18, 2017

Done!

lthms closed this discussion on November 18, 2017