{"image_url":null,"published":"2012-02-12 21:52:29","title":"TortoiseBzr\u9ad8\u901f\u5316\u306e\u305f\u3081\u306e\u30e1\u30e2","provider_name":"Hatena Blog","width":"100%","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fwonderful-panda.hatenadiary.org%2Fentry%2F20120212%2F1329051149\" title=\"TortoiseBzr\u9ad8\u901f\u5316\u306e\u305f\u3081\u306e\u30e1\u30e2 - wonderful_panda\u306e\u65e5\u8a18\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","author_name":"wonderful_panda","blog_url":"https://wonderful-panda.hatenadiary.org/","author_url":"https://blog.hatena.ne.jp/wonderful_panda/","type":"rich","provider_url":"https://hatena.blog","blog_title":"wonderful_panda\u306e\u65e5\u8a18","version":"1.0","categories":["Bazaar"],"height":"190","url":"https://wonderful-panda.hatenadiary.org/entry/20120212/1329051149","description":"\u307b\u307c\u81ea\u5206\u7528\u30e1\u30e2TortoiseBzr\u306e\u30a2\u30a4\u30b3\u30f3\u30aa\u30fc\u30d0\u30fc\u30ec\u30a4\u306f\u3001\u5185\u90e8\u3067bzr status\u3068\u540c\u3058\u51e6\u7406\u304c\u5b9f\u884c\u3055\u308c\u3066\u3044\u308b\u308f\u3051\u3060\u3051\u308c\u3069\u3082\u3001\u3053\u308c\u304c\u3042\u307e\u308a\u901f\u304f\u306a\u3044\u3002\u3053\u306e\u51e6\u7406\u3067\u3084\u3063\u3066\u308b\u3053\u3068\u306f\u4e3b\u306b\uff12\u3064\u3067\u3001 .bzr/checkout\u914d\u4e0b\u306edirstate\u3084conflicts\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u3093\u3067\u3001\u5404\u30d5\u30a1\u30a4\u30eb\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u72b6\u614b\u3092\u78ba\u8a8d\u3059\u308b\u3002 \u4f5c\u696d\u30b3\u30d4\u30fc\u5185\u306e\u5404\u30d5\u30a1\u30a4\u30eb\u306e\u66f4\u65b0\u6642\u523b\u3092\u53d6\u5f97\u3057\u3066\u3001dirstate\u5185\u306b\u8a18\u9332\u3055\u308c\u305f\u66f4\u65b0\u6642\u523b\u3068\u6bd4\u8f03\u3059\u308b\u3053\u3068\u306b\u3088\u3063\u3066\u5909\u66f4\u3055\u308c\u3066\u3044\u308b\u304b\u3069\u3046\u304b\u3092\u30c1\u30a7\u30c3\u30af\u3059\u308b\u3002\u5fc5\u8981\u306b\u5fdc\u3058\u3066\u30d5\u30a1\u30a4\u30eb\u306esha1\u3082\u53d6\u5f97\u3059\u308b\u3002 dirstate\u306a\u3093\u304b\u306f\u3001\u6570\u4e07\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u696d\u30b3\u30d4\u30fc\u3067\u3042\u3063\u3066\u3082\u305f\u304b\u3060\u304b\u6570MB\u306e\u30d5\u30a1\u30a4\u30eb\u306a\u306e\u2026"}